projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
modernize: Use braced-init list when returning types
[quassel.git]
/
src
/
common
/
quassel.h
diff --git
a/src/common/quassel.h
b/src/common/quassel.h
index
097481d
..
fd1dfd7
100644
(file)
--- a/
src/common/quassel.h
+++ b/
src/common/quassel.h
@@
-20,18
+20,19
@@
#pragma once
#pragma once
+#include "common-export.h"
+
#include <functional>
#include <functional>
-#include <memory>
#include <vector>
#include <vector>
+#include <QCommandLineParser>
#include <QCoreApplication>
#include <QFile>
#include <QCoreApplication>
#include <QFile>
-#include <QObject>
#include <QLocale>
#include <QLocale>
+#include <QObject>
#include <QString>
#include <QStringList>
#include <QString>
#include <QStringList>
-#include "abstractcliparser.h"
#include "abstractsignalwatcher.h"
#include "singleton.h"
#include "abstractsignalwatcher.h"
#include "singleton.h"
@@
-39,7
+40,7
@@
class QFile;
class Logger;
class Logger;
-class Quassel : public QObject, public Singleton<Quassel>
+class
COMMON_EXPORT
Quassel : public QObject, public Singleton<Quassel>
{
// TODO Qt5: Use Q_GADGET
Q_OBJECT
{
// TODO Qt5: Use Q_GADGET
Q_OBJECT
@@
-185,7
+186,6
@@
public:
static void loadTranslation(const QLocale &locale);
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);
static QString optionValue(const QString &option);
static bool isOptionSet(const QString &option);
@@
-219,9
+219,10
@@
signals:
void messageLogged(const QDateTime &timeStamp, const QString &msg);
private:
void messageLogged(const QDateTime &timeStamp, const QString &msg);
private:
- void setupEnvironment();
void registerMetaTypes();
void setupSignalHandling();
void registerMetaTypes();
void setupSignalHandling();
+ void setupEnvironment();
+ void setupCliParser();
/**
* Requests a reload of relevant runtime configuration.
/**
* Requests a reload of relevant runtime configuration.
@@
-248,7
+249,7
@@
private:
QStringList _dataDirPaths;
QString _translationDirPath;
QStringList _dataDirPaths;
QString _translationDirPath;
-
std::shared_ptr<AbstractCliParser>
_cliParser;
+
QCommandLineParser
_cliParser;
Logger *_logger;
AbstractSignalWatcher *_signalWatcher{nullptr};
Logger *_logger;
AbstractSignalWatcher *_signalWatcher{nullptr};
@@
-264,7
+265,7
@@
private:
*
* @sa Quassel::Feature
*/
*
* @sa Quassel::Feature
*/
-class Quassel::Features
+class
COMMON_EXPORT
Quassel::Features
{
public:
/**
{
public:
/**