rename of bufferview.ui according to new naming scheme

[quassel.git] / main / main_gui.cpp

diff --git a/main/main_gui.cpp b/main/main_gui.cpp
index b6e15b0..f48f615 100644 (file)
--- a/main/main_gui.cpp
+++ b/main/main_gui.cpp
@@ -23,10 +23,12 @@
 #include <QtGui>
 #include <QApplication>
 
+#include "style.h"
 #include "global.h"
 #include "guiproxy.h"
 #include "coreconnectdlg.h"
 #include "util.h"
+#include "chatwidget.h"
 
 #include "mainwin.h"
 
@@ -42,10 +44,14 @@ int main(int argc, char **argv) {
   global = new Global();
   guiProxy = new GUIProxy();
 
+  Style::init();
+
   MainWin mainWin;
+  mainWin.init();
   int exitCode = app.exec();
   delete guiProxy;
   delete global;
+  return exitCode;
 }
 
 void MainWin::syncToCore() {
@@ -68,6 +74,7 @@ void MainWin::syncToCore() {
     //qApp->quit();
     exit(1);
   }
+  /*
   foreach(QString net, state["CoreBackLog"].toMap().keys()) {
     QByteArray logbuf = state["CoreBackLog"].toMap()[net].toByteArray();
     QDataStream in(&logbuf, QIODevice::ReadOnly); in.setVersion(QDataStream::Qt_4_2);
@@ -77,6 +84,9 @@ void MainWin::syncToCore() {
     }
     qDebug() << net << coreBackLog[net].count();
   }
+  */
+  coreBuffers.clear();
+  foreach(QVariant v, state["CoreBuffers"].toList()) { coreBuffers.append(v.value<BufferId>()); }
 }
 
 GUIProxy::GUIProxy() {