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.h
diff --git
a/src/common/quassel.h
b/src/common/quassel.h
index
85660af
..
17e252c
100644
(file)
--- a/
src/common/quassel.h
+++ b/
src/common/quassel.h
@@
-32,12
+32,13
@@
#include <QStringList>
#include "abstractcliparser.h"
#include <QStringList>
#include "abstractcliparser.h"
+#include "singleton.h"
class QFile;
class Logger;
class QFile;
class Logger;
-class Quassel : public QObject
+class Quassel : public QObject
, public Singleton<Quassel>
{
// TODO Qt5: Use Q_GADGET
Q_OBJECT
{
// TODO Qt5: Use Q_GADGET
Q_OBJECT
@@
-146,7
+147,7
@@
public:
class Features;
class Features;
-
static Quassel *instance
();
+
Quassel
();
/**
* Provides access to the Logger instance.
/**
* Provides access to the Logger instance.
@@
-206,7
+207,6
@@
signals:
protected:
static bool init();
protected:
static bool init();
- static void destroy();
static void setRunMode(Quassel::RunMode runMode);
static void setRunMode(Quassel::RunMode runMode);
@@
-219,7
+219,6
@@
protected:
friend class MonolithicApplication;
private:
friend class MonolithicApplication;
private:
- Quassel();
void setupEnvironment();
void registerMetaTypes();
void setupEnvironment();
void registerMetaTypes();