X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fmain%2Fmain.cpp;h=075929367e193354f5f9479ed62bc16ce8236be8;hb=1f21c1f9613031ae263eeed0c4883bfcd5488343;hp=5ec89c5520d67409edd52738165465aabfc1ab24;hpb=d4b64322860b0dfcc9e1340a3b3a0b0df3e2eb81;p=quassel.git

diff --git a/src/main/main.cpp b/src/main/main.cpp
index 5ec89c55..07592936 100644
--- a/src/main/main.cpp
+++ b/src/main/main.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2018 by the Quassel Project                        *
+ *   Copyright (C) 2005-2019 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -22,40 +22,40 @@
 #include <memory>
 
 #ifdef HAVE_UMASK
-#  include <sys/types.h>
-#  include <sys/stat.h>
+#    include <sys/stat.h>
+#    include <sys/types.h>
 #endif /* HAVE_UMASK */
 
 #include <QCoreApplication>
 #include <QTextCodec>
 
 #ifdef BUILD_CORE
-#  include "coreapplication.h"
+#    include "coreapplication.h"
 #elif defined BUILD_QTUI
-#  include "aboutdata.h"
-#  include "qtuiapplication.h"
+#    include "aboutdata.h"
+#    include "qtuiapplication.h"
 #elif defined BUILD_MONO
-#  include "aboutdata.h"
-#  include "monoapplication.h"
+#    include "aboutdata.h"
+#    include "monoapplication.h"
 
 #else
-#error "Something is wrong - you need to #define a build mode!"
+#    error "Something is wrong - you need to #define a build mode!"
 #endif
 
 // We don't want quasselcore to depend on KDE
 #if defined HAVE_KF5 && defined BUILD_CORE
-#  undef HAVE_KF5
+#    undef HAVE_KF5
 #endif
 
 #if defined HAVE_KF5
-#  include <KCoreAddons/KAboutData>
-#  include <KCoreAddons/Kdelibs4ConfigMigrator>
+#    include <KCoreAddons/KAboutData>
+#    include <KCoreAddons/Kdelibs4ConfigMigrator>
 #endif
 
 #include "quassel.h"
 #include "types.h"
 
-int main(int argc, char **argv)
+int main(int argc, char** argv)
 {
     // Set umask so files are created with restricted permissions
 #ifdef HAVE_UMASK
@@ -74,13 +74,14 @@ int main(int argc, char **argv)
     // Migrate settings from KDE4 to KF5 if appropriate
 #ifdef HAVE_KF5
     Kdelibs4ConfigMigrator migrator(QCoreApplication::applicationName());
-    migrator.setConfigFiles(QStringList() << "quasselrc" << "quassel.notifyrc");
+    migrator.setConfigFiles(QStringList() << "quasselrc"
+                                          << "quassel.notifyrc");
     migrator.migrate();
 #endif
 
-    //Setup the High-DPI settings
-# if QT_VERSION >= 0x050600 && defined(Q_OS_WIN)
-    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); //Added in Qt 5.6
+    // Setup the High-DPI settings
+#if QT_VERSION >= 0x050600 && defined(Q_OS_WIN)
+    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);  // Added in Qt 5.6
 #endif
     QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
 
@@ -110,7 +111,7 @@ int main(int argc, char **argv)
     }
     catch (ExitException e) {
         if (!e.errorString.isEmpty()) {
-            qCritical() << e.errorString;
+            qCritical() << qPrintable(e.errorString);
         }
         return e.exitCode;
     }