X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=main%2Fmain_mono.cpp;h=49078c1e9df6d117716558921ac26d565df63ebb;hp=b935a12842fa8a7a256bb34443b6d6ef8ade45f2;hb=e368a1672c4f917bfa6adb52dae3b5ebfcd0db18;hpb=8a46d2fb3b2f409b80642cd6fe30645017c980bc diff --git a/main/main_mono.cpp b/main/main_mono.cpp index b935a128..49078c1e 100644 --- a/main/main_mono.cpp +++ b/main/main_mono.cpp @@ -24,37 +24,37 @@ #include "core.h" #include "quassel.h" -#include "logger.h" -#include "proxy.h" +#include "guiproxy.h" #include "mainwin.h" int main(int argc, char **argv) { - - Quassel::init(); - Logger *logger = new Logger(); - Quassel::setLogger(logger); - QApplication app(argc, argv); - 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(); - 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; }