X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.h;h=53869c2b2781c1057d7ca0b950b2c7e3e5ebfab5;hp=dad8ee2d8f734b0a690ec338ef4f341e94306c1c;hb=450c2bdf68fb837cb64fb3190912564ecc9f651e;hpb=047f7a5c2429d44adf0102ee25c7fb254f80ea69 diff --git a/src/core/core.h b/src/core/core.h index dad8ee2d..53869c2b 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -686,7 +686,7 @@ public: static QString setup(const QString &adminUser, const QString &adminPassword, const QString &backend, const QVariantMap &setupData, const QString &authenticator, const QVariantMap &authSetupMap); - static inline QTimer &syncTimer() { return instance()->_storageSyncTimer; } + static inline QTimer *syncTimer() { return &instance()->_storageSyncTimer; } inline OidentdConfigGenerator *oidentdConfigGenerator() const { return _oidentdConfigGenerator; } @@ -779,9 +779,10 @@ private: QHash _sessions; DeferredSharedPtr _storage; ///< Active storage backend DeferredSharedPtr _authenticator; ///< Active authenticator - QTimer _storageSyncTimer; QMap _authUserNames; + QTimer _storageSyncTimer; + #ifdef HAVE_SSL SslServer _server, _v6server; #else