X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmain.cpp;h=598425f6847084e5a916e719f40a25d7f7aec28b;hp=628c1a833401591619763044a573bbc000798ce2;hb=ab7ef4d24f62b5848b628482b7762ebfc0b53e1a;hpb=cb63e88d483f74c8f2f6e06c35c9d18be45cebaa

diff --git a/src/common/main.cpp b/src/common/main.cpp
index 628c1a83..598425f6 100644
--- a/src/common/main.cpp
+++ b/src/common/main.cpp
@@ -42,26 +42,14 @@
 #error "Something is wrong - you need to #define a build mode!"
 #endif
 
-// We don't want quasselcore to depend on KDE
-#if defined HAVE_KDE4 && defined BUILD_CORE
-#  undef HAVE_KDE4
-#endif
 // We don't want quasselcore to depend on KDE
 #if defined HAVE_KF5 && defined BUILD_CORE
 #  undef HAVE_KF5
 #endif
 
-#ifdef HAVE_KDE4
-#  include <KAboutData>
-#  include "kcmdlinewrapper.h"
-#elif defined HAVE_KF5
+#if defined HAVE_KF5
 #  include <KCoreAddons/KAboutData>
 #  include <KCoreAddons/Kdelibs4ConfigMigrator>
-#  include "qt5cliparser.h"
-#elif defined HAVE_QT5
-#  include "qt5cliparser.h"
-#else
-#  include "cliparser.h"
 #endif
 
 #if !defined(BUILD_CORE) && defined(STATIC)
@@ -70,7 +58,9 @@ Q_IMPORT_PLUGIN(qjpeg)
 Q_IMPORT_PLUGIN(qgif)
 #endif
 
+#include "qt5cliparser.h"
 #include "quassel.h"
+#include "types.h"
 
 int main(int argc, char **argv)
 {
@@ -78,11 +68,8 @@ int main(int argc, char **argv)
     umask(S_IRWXG | S_IRWXO);
 #endif
 
-#if QT_VERSION < 0x050000
-    // All our source files are in UTF-8, and Qt5 even requires that
-    QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
-    QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8"));
-#endif
+    // Instantiate early, so log messages are handled
+    Quassel quassel;
 
     Quassel::setupBuildInfo();
     QCoreApplication::setApplicationName(Quassel::buildInfo().applicationName);
@@ -90,18 +77,12 @@ int main(int argc, char **argv)
     QCoreApplication::setOrganizationName(Quassel::buildInfo().organizationName);
     QCoreApplication::setOrganizationDomain(Quassel::buildInfo().organizationDomain);
 
-    // on OSX with Qt4, raster seems to fix performance issues
-#if QT_VERSION < 0x050000 && defined Q_OS_MAC && !defined BUILD_CORE
-    QApplication::setGraphicsSystem("raster");
-#endif
-//Setup the High-DPI settings
+    //Setup the High-DPI settings
 # if QT_VERSION >= 0x050600 && defined(Q_OS_WIN)
     QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); //Added in Qt 5.6
 #endif
-# if QT_VERSION >= 0x050400
-   //Added in the early Qt5 versions (5.0?)- use 5.4 as the cutoff since lots of high-DPI work was added then
     QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
-# endif
+
     // We need to explicitly initialize the required resources when linking statically
 #ifndef BUILD_QTUI
     Q_INIT_RESOURCE(sql);
@@ -130,24 +111,7 @@ int main(int argc, char **argv)
 # endif
 #endif
 
-    std::shared_ptr<AbstractCliParser> cliParser;
-
-#ifdef HAVE_KDE4
-    // We need to init KCmdLineArgs first
-    KAboutData aboutData("quassel", "kdelibs4", ki18n("Quassel IRC"), Quassel::buildInfo().plainVersionString.toUtf8(),
-        ki18n("A modern, distributed IRC client"));
-    aboutData.addLicense(KAboutData::License_GPL_V2);
-    aboutData.addLicense(KAboutData::License_GPL_V3);
-    aboutData.setBugAddress("https://bugs.quassel-irc.org/projects/quassel-irc/issues/new");
-    aboutData.setOrganizationDomain(Quassel::buildInfo().organizationDomain.toUtf8());
-    KCmdLineArgs::init(argc, argv, &aboutData);
-
-    cliParser = std::make_shared<KCmdLineWrapper>();
-#elif defined HAVE_QT5
-    cliParser = std::make_shared<Qt5CliParser>();
-#else
-    cliParser = std::make_shared<CliParser>();
-#endif
+    std::shared_ptr<AbstractCliParser> cliParser = std::make_shared<Qt5CliParser>();
     Quassel::setCliParser(cliParser);
 
     // Initialize CLI arguments
@@ -198,17 +162,15 @@ int main(int argc, char **argv)
     cliParser->addOption("ssl-cert", 0, "Specify the path to the SSL Certificate", "path", "configdir/quasselCert.pem");
     cliParser->addOption("ssl-key", 0, "Specify the path to the SSL key", "path", "ssl-cert-path");
 #endif
+    cliParser->addSwitch("debug-irc", 0,
+                         "Enable logging of all raw IRC messages to debug log, including "
+                         "passwords!  In most cases you should also set --loglevel Debug");
+    cliParser->addOption("debug-irc-id", 0,
+                         "Limit raw IRC logging to this network ID.  Implies --debug-irc",
+                         "database network ID", "-1");
     cliParser->addSwitch("enable-experimental-dcc", 0, "Enable highly experimental and unfinished support for CTCP DCC (DANGEROUS)");
 #endif
 
-#ifdef HAVE_KDE4
-    // the KDE version needs this extra call to parse argc/argv before app is instantiated
-    if (!cliParser->init()) {
-        cliParser->usage();
-        return EXIT_FAILURE;
-    }
-#endif
-
 #if defined BUILD_CORE
     CoreApplication app(argc, argv);
 #elif defined BUILD_QTUI
@@ -217,13 +179,10 @@ int main(int argc, char **argv)
     MonolithicApplication app(argc, argv);
 #endif
 
-#ifndef HAVE_KDE4
-    // the non-KDE version parses after app has been instantiated
     if (!cliParser->init(app.arguments())) {
         cliParser->usage();
         return EXIT_FAILURE;
     }
-#endif
 
 // Migrate settings from KDE4 to KF5 if appropriate
 #ifdef HAVE_KF5
@@ -238,8 +197,15 @@ int main(int argc, char **argv)
     AboutData::setQuasselPersons(&aboutData);
     KAboutData::setApplicationData(aboutData.kAboutData());
 #endif
-    if (!app.init())
-        return EXIT_FAILURE;
+    try {
+        app.init();
+    }
+    catch (ExitException e) {
+        if (!e.errorString.isEmpty()) {
+            qCritical() << e.errorString;
+        }
+        return e.exitCode;
+    }
 
     return app.exec();
 }