aboutsummaryrefslogtreecommitdiffstats
path: root/textproc/kdiff3/files/patch-src-directorymergewindow.cpp
blob: d2be5585f4bc9a18c8b797b12ace7d59db5c93fb (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
--- src/directorymergewindow.cpp.orig   Fri Oct  3 18:32:57 2003
+++ src/directorymergewindow.cpp    Fri Oct  3 18:33:00 2003
@@ -863,7 +863,7 @@
 
       mfi.m_subPath = mfi.m_fileInfoA.exists() ? mfi.m_fileInfoA.filePath() :
                       mfi.m_fileInfoB.exists() ? mfi.m_fileInfoB.filePath() :
-                      mfi.m_fileInfoC.exists() ? mfi.m_fileInfoC.filePath() : "";
+                      mfi.m_fileInfoC.exists() ? mfi.m_fileInfoC.filePath() : QString("");
 
       g_pProgressDialog->setInformation(
          "Processing " + QString::number(currentIdx) +" / "+ QString::number(nrOfFiles)