X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Fgraphicalui.h;h=3b94544099e2ec7313352fa4a3d747dea8181e65;hb=fb80dab2044d302eb8ccacd0b34d4cbaf5fe904c;hp=b7e96bf3c2af6e2db0a60c3f9656cad43c254362;hpb=f18d6c40cd704e26734a77b371ae2c4a284bee38;p=quassel.git diff --git a/src/uisupport/graphicalui.h b/src/uisupport/graphicalui.h index b7e96bf3..3b945440 100644 --- a/src/uisupport/graphicalui.h +++ b/src/uisupport/graphicalui.h @@ -22,6 +22,7 @@ #define GRAPHICALUI_H_ #include "abstractui.h" +#include "singleton.h" class ActionCollection; class ContextMenuActionProvider; @@ -35,7 +36,7 @@ class UiStyle; #include #endif -class GraphicalUi : public AbstractUi +class GraphicalUi : public AbstractUi, protected Singleton { Q_OBJECT @@ -109,14 +110,11 @@ protected slots: virtual void disconnectedFromCore(); private: - static GraphicalUi *instance(); - static QWidget *_mainWidget; static QHash _actionCollections; static ContextMenuActionProvider *_contextMenuActionProvider; static ToolBarActionProvider *_toolBarActionProvider; static UiStyle *_uiStyle; - static bool _onAllDesktops; #ifdef Q_OS_WIN DWORD _dwTickCount;