Mercurial > hg > easyhg-kdiff3

comparison kdiff3/src/directorymergewindow.cpp @ 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 86d21651c8db
children bf8fa177e5a1
comparison
equal deleted inserted replaced
24:7cbcebe2b3e8 25:d101155f5c52
15 * * 15 * *
16 ***************************************************************************/ 16 ***************************************************************************/
17 17
18 /*************************************************************************** 18 /***************************************************************************
19 * $Log$ 19 * $Log$
20 * Revision 1.2 2003/10/11 12:41:57 joachim99
21 * Fix for gcc 2.95
22 *
20 * Revision 1.1 2003/10/06 18:38:48 joachim99 23 * Revision 1.1 2003/10/06 18:38:48 joachim99
21 * KDiff3 version 0.9.70 24 * KDiff3 version 0.9.70
22 * *
23 ***************************************************************************/ 25 ***************************************************************************/
24 26
25 #include "directorymergewindow.h" 27 #include "directorymergewindow.h"
26 #include "optiondialog.h" 28 #include "optiondialog.h"
27 #include <vector> 29 #include <vector>
864 const QString& fileName = j->first; 866 const QString& fileName = j->first;
865 MergeFileInfos& mfi = j->second; 867 MergeFileInfos& mfi = j->second;
866 868
867 mfi.m_subPath = mfi.m_fileInfoA.exists() ? mfi.m_fileInfoA.filePath() : 869 mfi.m_subPath = mfi.m_fileInfoA.exists() ? mfi.m_fileInfoA.filePath() :
868 mfi.m_fileInfoB.exists() ? mfi.m_fileInfoB.filePath() : 870 mfi.m_fileInfoB.exists() ? mfi.m_fileInfoB.filePath() :
869 mfi.m_fileInfoC.exists() ? mfi.m_fileInfoC.filePath() : ""; 871 mfi.m_fileInfoC.exists() ? mfi.m_fileInfoC.filePath() :
872 QString("");
870 873
871 g_pProgressDialog->setInformation( 874 g_pProgressDialog->setInformation(
872 "Processing " + QString::number(currentIdx) +" / "+ QString::number(nrOfFiles) 875 "Processing " + QString::number(currentIdx) +" / "+ QString::number(nrOfFiles)
873 +"\n" + fileName, double(currentIdx) / nrOfFiles, false ); 876 +"\n" + fileName, double(currentIdx) / nrOfFiles, false );
874 if ( g_pProgressDialog->wasCancelled() ) break; 877 if ( g_pProgressDialog->wasCancelled() ) break;