projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
qtui: Fix quit sequence and lifetime issues
[quassel.git]
/
src
/
uisupport
/
graphicalui.cpp
diff --git
a/src/uisupport/graphicalui.cpp
b/src/uisupport/graphicalui.cpp
index
fb4a2c7
..
3f65505
100644
(file)
--- 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;
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<GraphicalUi>(this)
{
{
- Q_ASSERT(!_instance);
- _instance = this;
-
#ifdef Q_OS_WIN
_dwTickCount = 0;
#endif
#ifdef Q_OS_WIN
_dwTickCount = 0;
#endif