From: Simon Hausmann <hausmann@kde.org>
Date: Mon, 16 Apr 2007 20:44:36 +0000 (+0000)
Subject: Merging branches/work/kmainwindow-decoupling-branch from Kevin and me which
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/931d9cc75acdd28c1d56d5ada5b5850e81e68da2

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 f378f959c..73de1b56c 100644
--- 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 bdb7ec59a..c3e0f91ab 100644
--- 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")