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

KDiff3-0.9.90-Qt4

--- a/kdiff3/src/directorymergewindow.cpp	Tue Apr 18 21:16:38 2006 +0000
+++ b/kdiff3/src/directorymergewindow.cpp	Sun May 14 20:09:06 2006 +0000
@@ -51,7 +51,7 @@
 #include <klocale.h>
 #include <iostream>
 #include <assert.h>
-#include <konq_popupmenu.h>
+//#include <konq_popupmenu.h>
 
 static bool conflictingFileTypes(MergeFileInfos& mfi);
 /*
@@ -134,7 +134,7 @@
 TempRemover::~TempRemover()
 {
    if ( m_bTemp && ! m_name.isEmpty() )
-      FileAccess::removeFile(m_name);
+      FileAccess::removeTempFile(m_name);
 }
 
 void DirectoryMergeWindow::fastFileComparison(
@@ -2873,8 +2873,8 @@
    m_pDirFoldAll = new KAction(i18n("Fold All Subdirs"), 0, p, SLOT(slotFoldAllSubdirs()), ac, "dir_fold_all");
    m_pDirUnfoldAll = new KAction(i18n("Unfold All Subdirs"), 0, p, SLOT(slotUnfoldAllSubdirs()), ac, "dir_unfold_all");
    m_pDirRescan = new KAction(i18n("Rescan"), Qt::SHIFT+Qt::Key_F5, p, SLOT(reload()), ac, "dir_rescan");
-   m_pDirSaveMergeState = 0;//new KAction(i18n("Save Directory Merge State ..."), 0, p, SLOT(slotSaveMergeState()), ac, "dir_save_merge_state");
-   m_pDirLoadMergeState = 0;//new KAction(i18n("Load Directory Merge State ..."), 0, p, SLOT(slotLoadMergeState()), ac, "dir_load_merge_state");
+   m_pDirSaveMergeState = 0; //new KAction(i18n("Save Directory Merge State ..."), 0, p, SLOT(slotSaveMergeState()), ac, "dir_save_merge_state");
+   m_pDirLoadMergeState = 0; //new KAction(i18n("Load Directory Merge State ..."), 0, p, SLOT(slotLoadMergeState()), ac, "dir_load_merge_state");
    m_pDirChooseAEverywhere = new KAction(i18n("Choose A for All Items"), 0, p, SLOT(slotChooseAEverywhere()), ac, "dir_choose_a_everywhere");
    m_pDirChooseBEverywhere = new KAction(i18n("Choose B for All Items"), 0, p, SLOT(slotChooseBEverywhere()), ac, "dir_choose_b_everywhere");
    m_pDirChooseCEverywhere = new KAction(i18n("Choose C for All Items"), 0, p, SLOT(slotChooseCEverywhere()), ac, "dir_choose_c_everywhere");