Mercurial > hg > easyhg-kdiff3

diff kdiff3/src/kdiff3_part.cpp @ 73:f7dad0aa6146

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
KDiff3-0.9.90-Qt4
author joachim99
date Sun, 14 May 2006 20:09:06 +0000
parents 5bbfe4784324
children
line wrap: on
line diff
--- a/kdiff3/src/kdiff3_part.cpp	Tue Apr 18 21:16:38 2006 +0000
+++ b/kdiff3/src/kdiff3_part.cpp	Sun May 14 20:09:06 2006 +0000
@@ -178,8 +178,8 @@
 
       m_widget->slotFileOpen2( fileName1, tempFileName, "", "",
                                "", version2.isEmpty() ? fileName2 : "REV:"+version2+":"+fileName2, "", 0 ); // alias names
-   std::cerr << "KDiff3: f1:" << fileName1.latin1() <<"<->"<<tempFileName.latin1()<< std::endl;
-//      FileAccess::removeFile( tempFileName );
+//    std::cerr << "KDiff3: f1:" << fileName1.latin1() <<"<->"<<tempFileName.latin1()<< std::endl;
+      FileAccess::removeTempFile( tempFileName );
    }
    else if ( version2.isEmpty() && f2.exists() )
    {
@@ -193,7 +193,8 @@
 
       m_widget->slotFileOpen2( tempFileName, fileName2, "", "",
                                version1.isEmpty() ? fileName1 : "REV:"+version1+":"+fileName1, "", "", 0 ); // alias name
-   std::cerr << "KDiff3: f2:" << fileName2.latin1() <<"<->"<<tempFileName.latin1()<< std::endl;
+//    std::cerr << "KDiff3: f2:" << fileName2.latin1() <<"<->"<<tempFileName.latin1()<< std::endl;
+      FileAccess::removeTempFile( tempFileName );
    }
    else if ( !version1.isEmpty() && !version2.isEmpty() )
    {
@@ -215,9 +216,9 @@
          "", 0
       );
 
-   std::cerr << "KDiff3: f1/2:" << tempFileName1.latin1() <<"<->"<<tempFileName2.latin1()<< std::endl;
-//      FileAccess::removeFile( tempFileName1 );
- //     FileAccess::removeFile( tempFileName2 );
+//    std::cerr << "KDiff3: f1/2:" << tempFileName1.latin1() <<"<->"<<tempFileName2.latin1()<< std::endl;
+      FileAccess::removeTempFile( tempFileName1 );
+      FileAccess::removeTempFile( tempFileName2 );
       return true;
    }
    else