Merging branches/work/kmainwindow-decoupling-branch from Kevin and me which

separates the xmlgui stuff from KMainWindow

svn path=/trunk/KDE/kdebase/apps/; revision=654728

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index f378f959ccd4534a5097b01613f746106fbe12f2..73de1b56cf6114cf999a4789d1aa1e4c9ffb4b9f 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -73,7 +73,7 @@
 #include <QDockWidget>
 
 DolphinMainWindow::DolphinMainWindow(int id) :
-        KMainWindow(0),
+        KXmlGuiWindow(0),
         m_newMenu(0),
         m_splitter(0),
         m_activeView(0),
@@ -394,7 +394,7 @@ void DolphinMainWindow::closeEvent(QCloseEvent* event)
 
     settings.save();
 
-    KMainWindow::closeEvent(event);
+    KXmlGuiWindow::closeEvent(event);
 }
 
 void DolphinMainWindow::saveProperties(KConfig* config)

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index bdb7ec59aeb6827a08386cda03ffae158bf90560..c3e0f91ab2cd161e9fb1ce0b7ea4ab261d659308 100644 (file)
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -25,7 +25,7 @@
 #include "dolphinview.h"
 #include "sidebarpage.h"
 
-#include <kmainwindow.h>
+#include <kxmlguiwindow.h>
 #include <ksortablelist.h>
 #include <konq_undo.h>
 
@@ -41,7 +41,7 @@ class QSplitter;
  *
  * Handles the menus, toolbars and Dolphin views.
  */
-class DolphinMainWindow: public KMainWindow
+class DolphinMainWindow: public KXmlGuiWindow
 {
     Q_OBJECT
     Q_CLASSINFO("D-Bus Interface", "org.kde.dolphin.MainWindow")