X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcommon%2Fmain.cpp;h=7880e0caf70d5b700b53a8cbfb93048763e70ca6;hb=7ee03b94132fcd5706e98db72de76c13cb977666;hp=86d874b520e80e3809dabaa5ef73cfff517003cb;hpb=9693b5238b76e6348413d68fa8c6ffc8c64fc12f;p=quassel.git

diff --git a/src/common/main.cpp b/src/common/main.cpp
index 86d874b5..7880e0ca 100644
--- a/src/common/main.cpp
+++ b/src/common/main.cpp
@@ -20,26 +20,26 @@
 
 #include "settings.h"
 #include <QString>
+#include <QTranslator>
 
 #if defined BUILD_CORE
 #include <QCoreApplication>
 #include <QDir>
 #include "core.h"
+#include "message.h"
 
-#elif defined BUILD_QTGUI
+#elif defined BUILD_QTUI
 #include <QApplication>
 #include "client.h"
-#include "clientproxy.h"
-#include "qtgui.h"
+#include "qtui.h"
 #include "style.h"
 
 #elif defined BUILD_MONO
 #include <QApplication>
 #include "client.h"
-#include "clientproxy.h"
 #include "core.h"
 #include "coresession.h"
-#include "qtgui.h"
+#include "qtui.h"
 #include "style.h"
 
 #else
@@ -59,27 +59,36 @@ int main(int argc, char **argv) {
   signal(SIGTERM, handle_signal);
   signal(SIGINT, handle_signal);
 
+  qRegisterMetaType<QVariant>("QVariant");
   qRegisterMetaType<Message>("Message");
-  qRegisterMetaType<BufferId>("BufferId");
+  qRegisterMetaType<BufferInfo>("BufferInfo");
+  qRegisterMetaTypeStreamOperators<QVariant>("QVariant");
   qRegisterMetaTypeStreamOperators<Message>("Message");
-  qRegisterMetaTypeStreamOperators<BufferId>("BufferId");
+  qRegisterMetaTypeStreamOperators<BufferInfo>("BufferInfo");
 
 #if defined BUILD_CORE
   Global::runMode = Global::CoreOnly;
   QCoreApplication app(argc, argv);
-#elif defined BUILD_QTGUI
+#elif defined BUILD_QTUI
   Global::runMode = Global::ClientOnly;
   QApplication app(argc, argv);
 #else
   Global::runMode = Global::Monolithic;
   QApplication app(argc, argv);
 #endif
+
+  //Just for testing
+  //QTranslator translator;
+  //translator.load(":i18n/quassel_de");
+  //app.installTranslator(&translator);
+
+            
   QCoreApplication::setOrganizationDomain("quassel-irc.org");
   QCoreApplication::setApplicationName("Quassel IRC");
   QCoreApplication::setOrganizationName("Quassel IRC Development Team");
 
   Global::quasselDir = QDir::homePath() + "/.quassel";
-#ifndef BUILD_QTGUI
+#ifndef BUILD_QTUI
   Core::instance();  // create and init the core
 #endif
 
@@ -87,7 +96,7 @@ int main(int argc, char **argv) {
 
 #ifndef BUILD_CORE
   Style::init();
-  QtGui *gui = new QtGui();
+  QtUi *gui = new QtUi();
   Client::init(gui);
   gui->init();
 #endif
@@ -101,30 +110,35 @@ int main(int argc, char **argv) {
   delete gui;
   Client::destroy();
 #endif
-#ifndef BUILD_QTGUI
+#ifndef BUILD_QTUI
   Core::destroy();
 #endif
 
   return exitCode;
 }
 
-#ifdef BUILD_QTGUI
+#ifdef BUILD_QTUI
 QVariant Client::connectToLocalCore(QString, QString) { return QVariant(); }
 void Client::disconnectFromLocalCore() {}
 
 #elif defined BUILD_MONO
 QVariant Client::connectToLocalCore(QString user, QString passwd) {
   // TODO catch exceptions
+  /*
   QVariant reply = Core::connectLocalClient(user, passwd);
   QObject::connect(Core::localSession(), SIGNAL(proxySignal(CoreSignal, QVariant, QVariant, QVariant)), ClientProxy::instance(), SLOT(recv(CoreSignal, QVariant, QVariant, QVariant)));
   QObject::connect(ClientProxy::instance(), SIGNAL(send(ClientSignal, QVariant, QVariant, QVariant)), Core::localSession(), SLOT(processSignal(ClientSignal, QVariant, QVariant, QVariant)));
   return reply;
+  */
+  return QVariant();
 }
 
 void Client::disconnectFromLocalCore() {
+  /*
   disconnect(Core::localSession(), 0, ClientProxy::instance(), 0);
   disconnect(ClientProxy::instance(), 0, Core::localSession(), 0);
   Core::disconnectLocalClient();
+  */
 }
 
 #endif