diff options
| author | Peter Penz <[email protected]> | 2011-04-12 20:01:31 +0200 |
|---|---|---|
| committer | Peter Penz <[email protected]> | 2011-04-12 20:08:08 +0200 |
| commit | de077f8477c0b7077ed9239be8741fcb67658ffa (patch) | |
| tree | 2057f6b2e6aa34d20b997cebb7a60ce6a0dff334 /src/dolphinmainwindow.h | |
| parent | a19e78d75b0bc451685d2248be0ec474b3c18966 (diff) | |
Let each DolphinMainWindow run in a custom process
A possible crash in one Dolphin window should not result in crashing
other Dolphin windows. Beside this it also prevents issues with
modal dialogs or notifications.
BUG: 269950
BUG: 206053
BUG: 196034
FIXED-IN: 4.7.0
Diffstat (limited to 'src/dolphinmainwindow.h')
| -rw-r--r-- | src/dolphinmainwindow.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h index a85b1c87a..ef4d29a5b 100644 --- a/src/dolphinmainwindow.h +++ b/src/dolphinmainwindow.h @@ -22,8 +22,6 @@ #ifndef DOLPHIN_MAINWINDOW_H #define DOLPHIN_MAINWINDOW_H -#include "panels/panel.h" - #include <config-nepomuk.h> #include <KFileItemDelegate> @@ -32,9 +30,8 @@ #include <kxmlguiwindow.h> #include <KActionMenu> -#include "views/dolphinview.h" - #include <QList> +#include <QWeakPointer> typedef KIO::FileUndoManager::CommandType CommandType; @@ -44,12 +41,15 @@ class DolphinSettingsDialog; class DolphinViewContainer; class DolphinRemoteEncoding; class KAction; +class KFileItem; +class KFileItemList; class KJob; class KNewFileMenu; class KTabBar; class KUrl; class QSplitter; class QToolButton; +class QVBoxLayout; /** * @short Main window for Dolphin. @@ -64,6 +64,7 @@ class DolphinMainWindow: public KXmlGuiWindow friend class DolphinApplication; public: + DolphinMainWindow(); virtual ~DolphinMainWindow(); /** @@ -448,9 +449,6 @@ private slots: void slotToolBarIconSizeChanged(const QSize& iconSize); private: - DolphinMainWindow(int id); - void init(); - /** * Activates the given view, which means that * all menu actions are applied to this view. When @@ -567,7 +565,7 @@ private: DolphinViewActionHandler* m_actionHandler; DolphinRemoteEncoding* m_remoteEncoding; - QPointer<DolphinSettingsDialog> m_settingsDialog; + QWeakPointer<DolphinSettingsDialog> m_settingsDialog; // Members for the toolbar menu that is shown when the menubar is hidden: QWidget* m_toolBarSpacer; |
