mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-28 03:21:56 +00:00
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
This commit is contained in:
parent
c4a6805856
commit
931d9cc75a
|
@ -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)
|
||||
|
|
|
@ -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")
|
||||
|
|
Loading…
Reference in a new issue