X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fquassel.h;fp=src%2Fcommon%2Fquassel.h;h=2b57a31e32a956622c657b72318b9a9769ebbb0c;hp=097481d1920ead5000277018007af19dbe2db501;hb=cc9f5099567634673f181aa49ae0b5d19bf93f7c;hpb=ce250a863bce3198096e65d4c7a68269495302dd diff --git a/src/common/quassel.h b/src/common/quassel.h index 097481d1..2b57a31e 100644 --- a/src/common/quassel.h +++ b/src/common/quassel.h @@ -21,17 +21,16 @@ #pragma once #include -#include #include +#include #include #include -#include #include +#include #include #include -#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 cliParser); static QString optionValue(const QString &option); static bool isOptionSet(const QString &option); @@ -219,9 +217,10 @@ signals: void messageLogged(const QDateTime &timeStamp, const QString &msg); private: - void setupEnvironment(); void registerMetaTypes(); void setupSignalHandling(); + void setupEnvironment(); + void setupCliParser(); /** * Requests a reload of relevant runtime configuration. @@ -248,7 +247,7 @@ private: QStringList _dataDirPaths; QString _translationDirPath; - std::shared_ptr _cliParser; + QCommandLineParser _cliParser; Logger *_logger; AbstractSignalWatcher *_signalWatcher{nullptr};