[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdesdk/kompare/komparepart
From:       Otto Bruggeman <bruggie () home ! nl>
Date:       2003-11-09 19:19:21
[Download RAW message or body]

CVS commit by bruggie: 

Compile speedups, removal of dead variables and --deprecated warning


  M +4 -3      kompare_part.cpp   1.71
  M +2 -16     kompare_part.h   1.33


--- kdesdk/kompare/komparepart/kompare_part.h  #1.32:1.33
@@ -24,7 +24,5 @@
 #include <kparts/part.h>
 
-#include "diffmodel.h"
 #include "kompare.h"
-#include "komparemodellist.h"
 
 #include "kompareinterface.h"
@@ -32,4 +30,5 @@
 class QWidget;
 
+class KTempFile;
 class KToggleAction;
 class KURL;
@@ -37,4 +36,5 @@ class KURL;
 namespace Diff2 {
 class Difference;
+class DiffModel;
 class KompareModelList;
 }
@@ -43,10 +43,5 @@ class ViewSettings;
 class KFileTreeView;
 class KompareView;
-class KompareNavigationTree;
-class DifferencesAction;
 class KompareProcess;
-class KompareStatsDlg;
-class KompareActions;
-class MiscSettings;
 
 /**
@@ -213,5 +208,4 @@ private:
         static ViewSettings* m_viewSettings;
         static DiffSettings* m_diffSettings;
-        static MiscSettings* m_miscSettings;
 
         Diff2::KompareModelList* m_modelList;
@@ -219,6 +213,4 @@ private:
         KompareView*             m_diffView;
 
-//      KompareNavigationTree*   m_navigationTree;
-
         KAction*                 m_save;
         KAction*                 m_saveAll;
@@ -226,13 +218,7 @@ private:
         KAction*                 m_swap;
         KAction*                 m_diffStats;
-        KompareActions*          m_kompareActions;
 
         KTempFile*               m_tempDiff;
 
-/*      KURL                     m_sourceURL;
-        KURL                     m_destinationURL;
-        QString                  m_localSource;
-        QString                  m_localDestination;
-*/
         struct Kompare::Info     m_info;
 };

--- kdesdk/kompare/komparepart/kompare_part.cpp  #1.70:1.71
@@ -35,9 +35,9 @@
 
 #include "diffmodel.h"
-#include "diffsettings.h"
-#include "viewsettings.h"
 #include "kompare_part.h"
 #include "komparelistview.h"
 #include "kompareconnectwidget.h"
+#include "diffsettings.h"
+#include "viewsettings.h"
 #include "kompareprefdlg.h"
 #include "komparesaveoptionswidget.h"
@@ -475,5 +475,6 @@ void KomparePart::saveDiff()
                                                      m_diffSettings, dlg );
         dlg->setMainWidget( w );
-        dlg->setButtonOKText( i18n("Save") );
+        KGuiItem saveGuiItem( i18n("Save") );
+        dlg->setButtonOK( saveGuiItem );
 
         if( dlg->exec() ) {


[prev in list] [next in list] [prev in thread] [next in thread]