X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fquassel.cpp;h=0af9a4a7870737fe9a5b5b2daeeb594fe79e09e7;hb=7768b765b21279eadef1400c6c614c63a3db8ed8;hp=62b8b3a8a4a19beb49309ff3aeeeec8b5bf704a9;hpb=12fbdede1ac2d35359eab076ccecb203c04139c4;p=quassel.git

diff --git a/src/common/quassel.cpp b/src/common/quassel.cpp
index 62b8b3a8..0af9a4a7 100644
--- a/src/common/quassel.cpp
+++ b/src/common/quassel.cpp
@@ -23,24 +23,28 @@
 #include <iostream>
 #include <signal.h>
 #if !defined Q_OS_WIN32 && !defined Q_OS_MAC
+#  include <sys/types.h>
+#  include <sys/time.h>
 #  include <sys/resource.h>
 #endif
 
 #include <QCoreApplication>
 #include <QDateTime>
 #include <QFileInfo>
+#include <QHostAddress>
 #include <QLibraryInfo>
 #include <QSettings>
 #include <QTranslator>
-#include <QHostAddress>
+#include <QUuid>
 
-#include "message.h"
+#include "bufferinfo.h"
 #include "identity.h"
+#include "logger.h"
+#include "message.h"
 #include "network.h"
-#include "bufferinfo.h"
-#include "types.h"
+#include "protocol.h"
 #include "syncableobject.h"
-#include "logger.h"
+#include "types.h"
 
 Quassel::BuildInfo Quassel::_buildInfo;
 AbstractCliParser *Quassel::_cliParser = 0;
@@ -186,6 +190,7 @@ void Quassel::registerMetaTypes()
     qRegisterMetaType<MsgId>("MsgId");
 
     qRegisterMetaType<QHostAddress>("QHostAddress");
+    qRegisterMetaType<QUuid>("QUuid");
 
     qRegisterMetaTypeStreamOperators<IdentityId>("IdentityId");
     qRegisterMetaTypeStreamOperators<BufferId>("BufferId");
@@ -194,6 +199,8 @@ void Quassel::registerMetaTypes()
     qRegisterMetaTypeStreamOperators<AccountId>("AccountId");
     qRegisterMetaTypeStreamOperators<MsgId>("MsgId");
 
+    qRegisterMetaType<Protocol::SessionState>("Protocol::SessionState");
+
     // Versions of Qt prior to 4.7 didn't define QVariant as a meta type
     if (!QMetaType::type("QVariant")) {
         qRegisterMetaType<QVariant>("QVariant");
@@ -495,7 +502,7 @@ void Quassel::loadTranslation(const QLocale &locale)
     quasselTranslator->setObjectName("QuasselTr");
     qApp->installTranslator(quasselTranslator);
 
-#if QT_VERSION >= 0x040800
+#if QT_VERSION >= 0x040800 && !defined Q_OS_MAC
     bool success = qtTranslator->load(locale, QString("qt_"), translationDirPath());
     if (!success)
         qtTranslator->load(locale, QString("qt_"), QLibraryInfo::location(QLibraryInfo::TranslationsPath));