X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fuisupport%2Fgraphicalui.cpp;h=3f65505a386688738e73e7c4ac015efabdd7c1a1;hb=72473527f99cbe68dcfcb4ca17f828bd3775bba7;hp=fb4a2c7fdbfe7baee1102ce300e1040cb0d8efac;hpb=f18d6c40cd704e26734a77b371ae2c4a284bee38;p=quassel.git diff --git a/src/uisupport/graphicalui.cpp b/src/uisupport/graphicalui.cpp index fb4a2c7f..3f65505a 100644 --- a/src/uisupport/graphicalui.cpp +++ b/src/uisupport/graphicalui.cpp @@ -43,23 +43,9 @@ ToolBarActionProvider *GraphicalUi::_toolBarActionProvider = 0; UiStyle *GraphicalUi::_uiStyle = 0; bool GraphicalUi::_onAllDesktops = false; -namespace { -GraphicalUi *_instance{nullptr}; - -} - - -GraphicalUi *GraphicalUi::instance() { - return _instance; -} - - -GraphicalUi::GraphicalUi(QObject *parent) : AbstractUi(parent) +GraphicalUi::GraphicalUi(QObject *parent) : AbstractUi(parent), Singleton(this) { - Q_ASSERT(!_instance); - _instance = this; - #ifdef Q_OS_WIN _dwTickCount = 0; #endif