Reorganizing of the Quassel architecture is almost done. Client and GUI have been...

[quassel.git] / src / common / main_mono.cpp

diff --git a/src/common/main_mono.cpp b/src/common/main_mono.cpp
index 419b150..a7565c5 100644 (file)
--- a/src/common/main_mono.cpp
+++ b/src/common/main_mono.cpp
@@ -22,15 +22,14 @@
 
 #include <QApplication>
 
-#include "gui.h"
+#include "client.h"
 #include "core.h"
 #include "style.h"
 #include "global.h"
-#include "guiproxy.h"
+#include "clientproxy.h"
 #include "coreproxy.h"
 #include "settings.h"
 #include "chatwidget.h"
-
 #include "mainwin.h"
 
 int main(int argc, char **argv) {
@@ -52,14 +51,15 @@ int main(int argc, char **argv) {
   Settings::init();
   Style::init();
 
-  //MainWin *mainWin = new MainWin();
+  MainWin *mainWin = new MainWin();
   //mainWin->show();
-  //mainWin->init();
-  Client::instance();
+  Client::init(mainWin);
+  mainWin->init();
   int exitCode = app.exec();
   //delete core;
   Client::destroy();
   Core::destroy();
+  delete mainWin;
   //delete guiProxy;
   //delete coreProxy;
   //delete global;