Mercurial > hg > easyhg-kdiff3

changeset 25:d101155f5c52

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix for gcc 2.95
author joachim99
date Sat, 11 Oct 2003 12:41:57 +0000
parents 7cbcebe2b3e8
children 07416314eb5e
files kdiff3/src/directorymergewindow.cpp
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/kdiff3/src/directorymergewindow.cpp	Sat Oct 11 12:38:58 2003 +0000
+++ b/kdiff3/src/directorymergewindow.cpp	Sat Oct 11 12:41:57 2003 +0000
@@ -17,9 +17,11 @@
 
 /***************************************************************************
  * $Log$
+ * Revision 1.2  2003/10/11 12:41:57  joachim99
+ * Fix for gcc 2.95
+ *
  * Revision 1.1  2003/10/06 18:38:48  joachim99
  * KDiff3 version 0.9.70
- *                                                                   *
  ***************************************************************************/
 
 #include "directorymergewindow.h"
@@ -866,7 +868,8 @@
 
       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)