projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Big refactoring completed. Everything prepared for the separation of core and gui.
[quassel.git]
/
main
/
main_mono.cpp
diff --git
a/main/main_mono.cpp
b/main/main_mono.cpp
index
b935a12
..
49078c1
100644
(file)
--- a/
main/main_mono.cpp
+++ b/
main/main_mono.cpp
@@
-24,37
+24,37
@@
#include "core.h"
#include "quassel.h"
#include "core.h"
#include "quassel.h"
-#include "logger.h"
-#include "proxy.h"
+#include "guiproxy.h"
#include "mainwin.h"
int main(int argc, char **argv) {
#include "mainwin.h"
int main(int argc, char **argv) {
-
- Quassel::init();
- Logger *logger = new Logger();
- Quassel::setLogger(logger);
-
QApplication app(argc, argv);
QApplication app(argc, argv);
-
QApplication::setOrganizationDomain("quassel-irc.org");
QApplication::setApplicationName("Quassel IRC");
QApplication::setOrganizationName("The Quassel Team");
QApplication::setOrganizationDomain("quassel-irc.org");
QApplication::setApplicationName("Quassel IRC");
QApplication::setOrganizationName("The Quassel Team");
- Core::init();
+ Quassel::runMode = Quassel::Monolithic;
+ quassel = Quassel::init();
+ core = Core::init();
+ guiProxy = GUIProxy::init();
+ // coreProxy = CoreProxy::init();
MainWin mainWin;
mainWin.show();
MainWin mainWin;
mainWin.show();
- return app.exec();
+ int exitCode = app.exec();
+ delete guiProxy;
+ delete quassel;
}
}
-QVariant proxyConnect(uint func, QVariant arg) {
- using namespace Proxy;
+void GUIProxy::send(GUISignal sig, QVariant arg1, QVariant arg2, QVariant arg3) {
+
+
+
+}
+
+void GUIProxy::recv(CoreSignal sig, QVariant arg1, QVariant arg2, QVariant arg3) {
+
- switch(func) {
- case LOAD_IDENTITIES: return (QVariant) CoreProxy::loadIdentities();
- case STORE_IDENTITIES: CoreProxy::storeIdentities(arg.toMap()); return 0;
- }
- return 0;
}
}