projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Finished logical separation of core and GUI. Monolithic build should work as expected.
[quassel.git]
/
main
/
quassel.h
diff --git
a/main/quassel.h
b/main/quassel.h
index
b3c942b
..
3d2b541
100644
(file)
--- a/
main/quassel.h
+++ b/
main/quassel.h
@@
-39,7
+39,7
@@
class Quassel : public QObject {
Q_OBJECT
public:
Q_OBJECT
public:
-
static Quassel * init
();
+
Quassel
();
//static Logger *getLogger();
//static void setLogger(Logger *);
//static Logger *getLogger();
//static void setLogger(Logger *);
@@
-63,9
+63,9
@@
class Quassel : public QObject {
//static Logger *logger;
// static QString iconPath;
//static Logger *logger;
// static QString iconPath;
-
static
QHash<QString, QString> iconMap;
-
static
QMutex mutex;
-
static
QHash<QString, QVariant> data;
+ QHash<QString, QString> iconMap;
+ QMutex mutex;
+ QHash<QString, QVariant> data;
};
class Exception {
};
class Exception {