X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fmain%2Fmain.cpp;h=075929367e193354f5f9479ed62bc16ce8236be8;hb=52209badc8e769e50aa3019b63689dda0e79e9d0;hp=c8185b03b4cca3ba5aed941290a9f53f6c80d505;hpb=4ce53949ab7d52a49ae79b8817bd3aa50fada0d1;p=quassel.git

diff --git a/src/main/main.cpp b/src/main/main.cpp
index c8185b03..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,69 +22,41 @@
 #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)
 {
-    // We need to explicitly initialize the required resources when linking statically
-#ifndef BUILD_QTUI
-    Q_INIT_RESOURCE(sql);
-#endif
-#ifndef BUILD_CORE
-    Q_INIT_RESOURCE(pics);
-    Q_INIT_RESOURCE(hicolor_icons);
-#endif
-
-#ifdef EMBED_DATA
-    Q_INIT_RESOURCE(i18n);
-# ifndef BUILD_CORE
-    Q_INIT_RESOURCE(data);
-    Q_INIT_RESOURCE(breeze_icons);
-    Q_INIT_RESOURCE(breeze_dark_icons);
-#  ifdef WITH_OXYGEN_ICONS
-      Q_INIT_RESOURCE(oxygen_icons);
-#  endif
-#  ifdef WITH_BUNDLED_ICONS
-      Q_INIT_RESOURCE(breeze_icon_theme);
-      Q_INIT_RESOURCE(breeze_dark_icon_theme);
-#   ifdef WITH_OXYGEN_ICONS
-      Q_INIT_RESOURCE(oxygen_icon_theme);
-#   endif
-#  endif
-# endif
-#endif
-
     // Set umask so files are created with restricted permissions
 #ifdef HAVE_UMASK
     umask(S_IRWXG | S_IRWXO);
@@ -102,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);
 
@@ -138,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;
     }