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 77f7b87..fc40bbb 100644 (file)
--- a/src/common/quassel.h
+++ b/src/common/quassel.h
@@ -115,11 +115,7 @@ public:
      *
      * This list should be cleaned up after every protocol break, as we can assume them to be present then.
      */
-    #if QT_VERSION >= 0x050000
     enum class Feature : uint32_t {
-    #else
-    enum Feature {
-    #endif
         SynchronizedMarkerLine,
         SaslAuthentication,
         SaslExternal,
@@ -138,9 +134,7 @@ public:
         LongTime,                 ///< Serialize time as 64-bit values
         RichMessages,             ///< Real Name and Avatar URL in backlog
         BacklogFilterType,        ///< BacklogManager supports filtering backlog by MessageType
-#if QT_VERSION >= 0x050500
         EcdsaCertfpKeys,          ///< ECDSA keys for CertFP in identities
-#endif
         LongMessageId,            ///< 64-bit IDs for messages
         SyncedCoreInfo,           ///< CoreInfo dynamically updated using signals
     };
@@ -150,6 +144,8 @@ public:
 
     Quassel();
 
+    void init(RunMode runMode);
+
     /**
      * Provides access to the Logger instance.
      *
@@ -223,10 +219,6 @@ signals:
     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();
 
@@ -257,7 +249,6 @@ private slots:
 private:
     BuildInfo _buildInfo;
     RunMode _runMode;
-    bool _initialized{false};
     bool _quitting{false};
 
     QString _coreDumpFileName;