Merged changes from branch "sput" r62:66 back into trunk.

[quassel.git] / main / main_mono.cpp

diff --git a/main/main_mono.cpp b/main/main_mono.cpp
index 49078c1..87360c6 100644 (file)
--- a/main/main_mono.cpp
+++ b/main/main_mono.cpp
@@ -23,8 +23,12 @@
 #include <QApplication>
 
 #include "core.h"
-#include "quassel.h"
+#include "style.h"
+#include "global.h"
 #include "guiproxy.h"
+#include "coreproxy.h"
+#include "settings.h"
+#include "chatwidget.h"
 
 #include "mainwin.h"
 
@@ -34,27 +38,54 @@ int main(int argc, char **argv) {
   QApplication::setApplicationName("Quassel IRC");
   QApplication::setOrganizationName("The Quassel Team");
 
-  Quassel::runMode = Quassel::Monolithic;
-  quassel = Quassel::init();
-  core = Core::init();
-  guiProxy = GUIProxy::init();
-  // coreProxy = CoreProxy::init();
+  Global::runMode = Global::Monolithic;
+  Global::quasselDir = QDir::homePath() + "/.quassel";
 
-  MainWin mainWin;
-  mainWin.show();
+  //settings = new Settings();
+  global = new Global();
+  guiProxy = new GUIProxy();
+  coreProxy = new CoreProxy();
+
+  Settings::init();
+  Style::init();
+
+  MainWin *mainWin = new MainWin();
+  mainWin->show();
+  mainWin->init();
   int exitCode = app.exec();
+  delete core;
   delete guiProxy;
-  delete quassel;
+  delete coreProxy;
+  delete global;
+  delete mainWin;
+  //delete settings;
+  return exitCode;
 }
 
-void GUIProxy::send(GUISignal sig, QVariant arg1, QVariant arg2, QVariant arg3) {
-
-
+void MainWin::syncToCore() {
+  Q_ASSERT(global->getData("CoreReady").toBool());
+  coreBuffers = core->getBuffers();
+  // NOTE: We don't need to request server states, because in the monolithic version there can't be
+  //       any servers connected at this stage...
+}
 
+void CoreProxy::sendToGUI(CoreSignal sig, QVariant arg1, QVariant arg2, QVariant arg3) {
+  guiProxy->recv(sig, arg1, arg2, arg3);
 }
 
-void GUIProxy::recv(CoreSignal sig, QVariant arg1, QVariant arg2, QVariant 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) {}
 
-}