Properly register the Network::ConnectionState enum

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

diff --git a/src/common/quassel.cpp b/src/common/quassel.cpp
index 30572fa..eb854b3 100644 (file)
--- a/src/common/quassel.cpp
+++ b/src/common/quassel.cpp
@@ -32,6 +32,7 @@
 #include <QLibraryInfo>
 #include <QSettings>
 #include <QTranslator>
+#include <QHostAddress>
 
 #include "message.h"
 #include "identity.h"
@@ -118,27 +119,30 @@ bool Quassel::init() {
   DEBUG = isOptionSet("debug");
 
   // set up logging
-  if(isOptionSet("loglevel")) {
-    QString level = optionValue("loglevel");
-
-    if(level == "Debug") _logLevel = DebugLevel;
-    else if(level == "Info") _logLevel = InfoLevel;
-    else if(level == "Warning") _logLevel= WarningLevel;
-    else if(level == "Error") _logLevel = ErrorLevel;
-  }
+  if(Quassel::runMode() != Quassel::ClientOnly) {
+    if(isOptionSet("loglevel")) {
+      QString level = optionValue("loglevel");
+
+      if(level == "Debug") _logLevel = DebugLevel;
+      else if(level == "Info") _logLevel = InfoLevel;
+      else if(level == "Warning") _logLevel= WarningLevel;
+      else if(level == "Error") _logLevel = ErrorLevel;
+    }
 
-  QString logfilename = optionValue("logfile");
-  if(!logfilename.isEmpty()) {
-    _logFile = new QFile(logfilename);
-    if(!_logFile->open(QIODevice::Append | QIODevice::Text)) {
-      qWarning() << "Could not open log file" << logfilename << ":" << _logFile->errorString();
-      _logFile->deleteLater();
-      _logFile = 0;
+    QString logfilename = optionValue("logfile");
+    if(!logfilename.isEmpty()) {
+      _logFile = new QFile(logfilename);
+      if(!_logFile->open(QIODevice::Append | QIODevice::Text)) {
+        qWarning() << "Could not open log file" << logfilename << ":" << _logFile->errorString();
+        _logFile->deleteLater();
+        _logFile = 0;
+      }
     }
+#ifdef HAVE_SYSLOG
+    _logToSyslog = isOptionSet("syslog");
+#endif
   }
 
-  _logToSyslog = isOptionSet("syslog");
-
   return true;
 }
 
@@ -157,14 +161,12 @@ void Quassel::registerMetaTypes() {
   qRegisterMetaType<NetworkInfo>("NetworkInfo");
   qRegisterMetaType<Network::Server>("Network::Server");
   qRegisterMetaType<Identity>("Identity");
-  qRegisterMetaType<Network::ConnectionState>("Network::ConnectionState");
 
   qRegisterMetaTypeStreamOperators<Message>("Message");
   qRegisterMetaTypeStreamOperators<BufferInfo>("BufferInfo");
   qRegisterMetaTypeStreamOperators<NetworkInfo>("NetworkInfo");
   qRegisterMetaTypeStreamOperators<Network::Server>("Network::Server");
   qRegisterMetaTypeStreamOperators<Identity>("Identity");
-  qRegisterMetaTypeStreamOperators<qint8>("Network::ConnectionState");
 
   qRegisterMetaType<IdentityId>("IdentityId");
   qRegisterMetaType<BufferId>("BufferId");
@@ -173,6 +175,8 @@ void Quassel::registerMetaTypes() {
   qRegisterMetaType<AccountId>("AccountId");
   qRegisterMetaType<MsgId>("MsgId");
 
+  qRegisterMetaType<QHostAddress>("QHostAddress");
+
   qRegisterMetaTypeStreamOperators<IdentityId>("IdentityId");
   qRegisterMetaTypeStreamOperators<BufferId>("BufferId");
   qRegisterMetaTypeStreamOperators<NetworkId>("NetworkId");