expanding->preferred

[quassel.git] / main / main_mono.cpp

diff --git a/main/main_mono.cpp b/main/main_mono.cpp
index 620084b..6bd0f33 100644 (file)
--- a/main/main_mono.cpp
+++ b/main/main_mono.cpp
@@ -22,24 +22,52 @@
 
 #include <QApplication>
 
-#include "quassel.h"
-#include "logger.h"
+#include "core.h"
+#include "global.h"
+#include "guiproxy.h"
+#include "coreproxy.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");
 
+  Global::runMode = Global::Monolithic;
+  global = new Global();
+  guiProxy = new GUIProxy();
+  coreProxy = new CoreProxy();
+  core = new Core();
+
   MainWin mainWin;
   mainWin.show();
-  return app.exec();
+  int exitCode = app.exec();
+  delete core;
+  delete guiProxy;
+  delete coreProxy;
+  delete global;
+  return exitCode;
+}
+
+void CoreProxy::sendToGUI(CoreSignal sig, QVariant arg1, QVariant arg2, QVariant arg3) {
+  guiProxy->recv(sig, arg1, arg2, arg3);
 }
+
+GUIProxy::GUIProxy() {
+  if(guiProxy) qFatal("Trying to instantiate more than one CoreProxy object!");
+}
+
+void GUIProxy::send(GUISignal sig, QVariant arg1, QVariant arg2, QVariant arg3) {
+  coreProxy->recv(sig, arg1, arg2, arg3);
+}
+
+// Dummy function definitions
+// These are not needed, since we don't have a network connection to the core.
+void GUIProxy::serverHasData() {}
+void GUIProxy::connectToCore(QString, quint16) {}
+void GUIProxy::disconnectFromCore() {}
+void GUIProxy::updateCoreData(QString) {}
+void GUIProxy::serverError(QAbstractSocket::SocketError) {}
+