projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
common: Use the Singleton mixin for the Quassel instance
[quassel.git]
/
src
/
common
/
quassel.cpp
diff --git
a/src/common/quassel.cpp
b/src/common/quassel.cpp
index
5ceddb1
..
9a922a6
100644
(file)
--- a/
src/common/quassel.cpp
+++ b/
src/common/quassel.cpp
@@
-54,15
+54,9
@@
#include "../../version.h"
#include "../../version.h"
-Quassel *Quassel::instance()
-{
- static Quassel instance;
- return &instance;
-}
-
-
Quassel::Quassel()
Quassel::Quassel()
- : _logger{new Logger{this}}
+ : Singleton<Quassel>{this}
+ , _logger{new Logger{this}}
{
}
{
}
@@
-129,11
+123,6
@@
bool Quassel::init()
}
}
-void Quassel::destroy()
-{
-}
-
-
Logger *Quassel::logger() const
{
return _logger;
Logger *Quassel::logger() const
{
return _logger;