qtui: Remove bogus Quassel instance

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

diff --git a/src/common/quassel.cpp b/src/common/quassel.cpp
index c75836a..92b03e2 100644 (file)
--- a/src/common/quassel.cpp
+++ b/src/common/quassel.cpp
@@ -62,6 +62,17 @@ Quassel *Quassel::instance()
 
 Quassel::Quassel()
 {
+}
+
+
+bool Quassel::init()
+{
+    if (instance()->_initialized)
+        return true;  // allow multiple invocations because of MonolithicApplication
+
+    // Setup signal handling
+    // TODO: Don't use unsafe methods, see handleSignal()
+
     // We catch SIGTERM and SIGINT (caused by Ctrl+C) to graceful shutdown Quassel.
     signal(SIGTERM, handleSignal);
     signal(SIGINT, handleSignal);
@@ -70,13 +81,6 @@ Quassel::Quassel()
     // Windows does not support SIGHUP
     signal(SIGHUP, handleSignal);
 #endif
-}
-
-
-bool Quassel::init()
-{
-    if (instance()->_initialized)
-        return true;  // allow multiple invocations because of MonolithicApplication
 
     if (instance()->_handleCrashes) {
         // we have crashhandler for win32 and unix (based on execinfo).
@@ -88,12 +92,12 @@ bool Quassel::init()
 
         if (rc == -1 || !((long)limit->rlim_cur > 0 || limit->rlim_cur == RLIM_INFINITY)) {
 # endif /* Q_OS_WIN */
-        signal(SIGABRT, handleSignal);
-        signal(SIGSEGV, handleSignal);
+            signal(SIGABRT, handleSignal);
+            signal(SIGSEGV, handleSignal);
 # ifndef Q_OS_WIN
-        signal(SIGBUS, handleSignal);
-    }
-    free(limit);
+            signal(SIGBUS, handleSignal);
+        }
+        free(limit);
 # endif /* Q_OS_WIN */
 #endif /* Q_OS_WIN || HAVE_EXECINFO */
     }
@@ -104,7 +108,7 @@ bool Quassel::init()
     instance()->setupEnvironment();
     instance()->registerMetaTypes();
 
-    Network::setDefaultCodecForServer("ISO-8859-1");
+    Network::setDefaultCodecForServer("UTF-8");
     Network::setDefaultCodecForEncoding("UTF-8");
     Network::setDefaultCodecForDecoding("ISO-8859-15");
 
@@ -118,37 +122,41 @@ bool Quassel::init()
         return false;
     }
 
-    // set up logging
-    if (Quassel::runMode() != Quassel::ClientOnly) {
-        if (isOptionSet("loglevel")) {
-            QString level = optionValue("loglevel");
-
-            if (level == "Debug")
-                setLogLevel(DebugLevel);
-            else if (level == "Info")
-                setLogLevel(InfoLevel);
-            else if (level == "Warning")
-                setLogLevel(WarningLevel);
-            else if (level == "Error")
-                setLogLevel(ErrorLevel);
-            else {
-                qWarning() << qPrintable(tr("Invalid log level %1; supported are Debug|Info|Warning|Error").arg(level));
-                return false;
-            }
+    // Set up logging
+    if (isOptionSet("loglevel")) {
+        QString level = optionValue("loglevel").toLower();
+
+        if (level == "debug")
+            setLogLevel(DebugLevel);
+        else if (level == "info")
+            setLogLevel(InfoLevel);
+        else if (level == "warning")
+            setLogLevel(WarningLevel);
+        else if (level == "error")
+            setLogLevel(ErrorLevel);
+        else {
+            qWarning() << qPrintable(tr("Invalid log level %1; supported are Debug|Info|Warning|Error").arg(level));
+            return false;
         }
+    }
 
-        QString logfilename = optionValue("logfile");
-        if (!logfilename.isEmpty()) {
-            instance()->_logFile.reset(new QFile{logfilename});
-            if (!logFile()->open(QIODevice::Append | QIODevice::Text)) {
-                qWarning() << "Could not open log file" << logfilename << ":" << logFile()->errorString();
-                instance()->_logFile.reset();
-            }
+    QString logfilename = optionValue("logfile");
+    if (!logfilename.isEmpty()) {
+        instance()->_logFile.reset(new QFile{logfilename});
+        if (!logFile()->open(QIODevice::Append | QIODevice::Text)) {
+            qWarning() << qPrintable(tr("Could not open log file \"%1\": %2").arg(logfilename, logFile()->errorString()));
+            instance()->_logFile.reset();
         }
+    }
 #ifdef HAVE_SYSLOG
-        instance()->_logToSyslog = isOptionSet("syslog");
+    instance()->_logToSyslog = isOptionSet("syslog");
+#endif
+
+#if QT_VERSION < 0x050000
+    qInstallMsgHandler(Logger::logMessage);
+#else
+    qInstallMessageHandler(Logger::logMessage);
 #endif
-    }
 
     return true;
 }
@@ -295,12 +303,13 @@ void Quassel::setupBuildInfo()
     // Check if we got a commit hash
     if (!QString(GIT_HEAD).isEmpty()) {
         buildInfo.commitHash = GIT_HEAD;
-        QDateTime date;
-        date.setTime_t(GIT_COMMIT_DATE);
-        buildInfo.commitDate = date.toString();
+        // Set to Unix epoch, wrapped as a string for backwards-compatibility
+        buildInfo.commitDate = QString::number(GIT_COMMIT_DATE);
     }
     else if (!QString(DIST_HASH).contains("Format")) {
         buildInfo.commitHash = DIST_HASH;
+        // Leave as Unix epoch if set as Unix epoch, but don't force this for
+        // backwards-compatibility with existing packaging/release tools that might set strings.
         buildInfo.commitDate = QString(DIST_DATE);
     }
 
@@ -351,6 +360,8 @@ const Quassel::BuildInfo &Quassel::buildInfo()
 
 
 //! Signal handler for graceful shutdown.
+//! @todo: Ensure this doesn't use unsafe methods (it does currently)
+//!        cf. QSocketNotifier, UnixSignalWatcher
 void Quassel::handleSignal(int sig)
 {
     switch (sig) {
@@ -505,6 +516,8 @@ QString Quassel::configDirPath()
 #endif /* Q_OS_MAC */
     }
 
+    path = QFileInfo{path}.absoluteFilePath();
+
     if (!path.endsWith(QDir::separator()) && !path.endsWith('/'))
         path += QDir::separator();
 
@@ -517,7 +530,6 @@ QString Quassel::configDirPath()
     }
 
     instance()->_configDirPath = path;
-
     return path;
 }