X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fquassel.h;h=2b57a31e32a956622c657b72318b9a9769ebbb0c;hp=fc40bbb438b3ab115e4d2b7b9c00379a8e0e998d;hb=00e1a9c29e792ba4d65dba21b7ba04131bcb13bc;hpb=4e43a17088e8ff76c220bd8b4ebf37d9dbb4863a

diff --git a/src/common/quassel.h b/src/common/quassel.h
index fc40bbb4..2b57a31e 100644
--- a/src/common/quassel.h
+++ b/src/common/quassel.h
@@ -21,17 +21,16 @@
 #pragma once
 
 #include <functional>
-#include <memory>
 #include <vector>
 
+#include <QCommandLineParser>
 #include <QCoreApplication>
 #include <QFile>
-#include <QObject>
 #include <QLocale>
+#include <QObject>
 #include <QString>
 #include <QStringList>
 
-#include "abstractcliparser.h"
 #include "abstractsignalwatcher.h"
 #include "singleton.h"
 
@@ -185,7 +184,6 @@ public:
 
     static void loadTranslation(const QLocale &locale);
 
-    static void setCliParser(std::shared_ptr<AbstractCliParser> cliParser);
     static QString optionValue(const QString &option);
     static bool isOptionSet(const QString &option);
 
@@ -218,18 +216,11 @@ public slots:
 signals:
     void messageLogged(const QDateTime &timeStamp, const QString &msg);
 
-protected:
-    static void setDataDirPaths(const QStringList &paths);
-    static QStringList findDataDirPaths();
-
-    friend class CoreApplication;
-    friend class QtUiApplication;
-    friend class MonolithicApplication;
-
 private:
-    void setupEnvironment();
     void registerMetaTypes();
     void setupSignalHandling();
+    void setupEnvironment();
+    void setupCliParser();
 
     /**
      * Requests a reload of relevant runtime configuration.
@@ -256,7 +247,7 @@ private:
     QStringList _dataDirPaths;
     QString _translationDirPath;
 
-    std::shared_ptr<AbstractCliParser> _cliParser;
+    QCommandLineParser _cliParser;
 
     Logger *_logger;
     AbstractSignalWatcher *_signalWatcher{nullptr};