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.cpp
diff --git
a/main/quassel.cpp
b/main/quassel.cpp
index
6e90e13
..
7ba190b
100644
(file)
--- a/
main/quassel.cpp
+++ b/
main/quassel.cpp
@@
-28,12
+28,10
@@
extern void messageHandler(QtMsgType type, const char *msg);
extern void messageHandler(QtMsgType type, const char *msg);
-Quassel
* Quassel::init
() {
- if(quassel)
return quassel
;
+Quassel
::Quassel
() {
+ if(quassel)
qFatal("Trying to instantiate more than one Quassel object!")
;
qInstallMsgHandler(messageHandler);
qInstallMsgHandler(messageHandler);
- quassel = new Quassel();
//initIconMap();
//initIconMap();
- return quassel;
}
/*
}
/*
@@
-95,5
+93,3
@@
void Quassel::initIconMap() {
Quassel *quassel = 0;
Quassel::RunMode Quassel::runMode;
Quassel *quassel = 0;
Quassel::RunMode Quassel::runMode;
-QMutex Quassel::mutex;
-QHash<QString, QVariant> Quassel::data;