Renaming QtGui to QtUi, in order to not confuse build systems on non-case-sensitive

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

diff --git a/src/common/main.cpp b/src/common/main.cpp
index 4b99a39..7880e0c 100644 (file)
--- a/src/common/main.cpp
+++ b/src/common/main.cpp
@@ -20,6 +20,7 @@
 
 #include "settings.h"
 #include <QString>
+#include <QTranslator>
 
 #if defined BUILD_CORE
 #include <QCoreApplication>
@@ -27,20 +28,18 @@
 #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
@@ -62,27 +61,34 @@ int main(int argc, char **argv) {
 
   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
 
@@ -90,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
@@ -104,14 +110,14 @@ 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() {}