projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
qt4-b-gone: Reorganize the initialization sequence
[quassel.git]
/
src
/
common
/
quassel.h
diff --git
a/src/common/quassel.h
b/src/common/quassel.h
index
b658677
..
fc40bbb
100644
(file)
--- a/
src/common/quassel.h
+++ b/
src/common/quassel.h
@@
-144,6
+144,8
@@
public:
Quassel();
Quassel();
+ void init(RunMode runMode);
+
/**
* Provides access to the Logger instance.
*
/**
* Provides access to the Logger instance.
*
@@
-217,10
+219,6
@@
signals:
void messageLogged(const QDateTime &timeStamp, const QString &msg);
protected:
void messageLogged(const QDateTime &timeStamp, const QString &msg);
protected:
- static bool init();
-
- static void setRunMode(Quassel::RunMode runMode);
-
static void setDataDirPaths(const QStringList &paths);
static QStringList findDataDirPaths();
static void setDataDirPaths(const QStringList &paths);
static QStringList findDataDirPaths();
@@
-251,7
+249,6
@@
private slots:
private:
BuildInfo _buildInfo;
RunMode _runMode;
private:
BuildInfo _buildInfo;
RunMode _runMode;
- bool _initialized{false};
bool _quitting{false};
QString _coreDumpFileName;
bool _quitting{false};
QString _coreDumpFileName;