core: Change signature of Core::syncTimer()

Returning a pointer is more consistent with the rest of the code
base and established patterns than returning a non-const reference.

diff --git a/src/core/core.h b/src/core/core.h
index dad8ee2..53869c2 100644 (file)
--- 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<UserId, SessionThread *> _sessions;
     DeferredSharedPtr<Storage>       _storage;        ///< Active storage backend
     DeferredSharedPtr<Authenticator> _authenticator;  ///< Active authenticator
-    QTimer _storageSyncTimer;
     QMap<UserId, QString> _authUserNames;
 
+    QTimer _storageSyncTimer;
+
 #ifdef HAVE_SSL
     SslServer _server, _v6server;
 #else

diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp
index 929895a..689f043 100644 (file)
--- a/src/core/coresession.cpp
+++ b/src/core/coresession.cpp
@@ -131,7 +131,7 @@ CoreSession::CoreSession(UserId uid, bool restoreState, bool strictIdentEnabled,
     eventManager()->registerObject(ctcpParser(), EventManager::LowPriority, "send");
 
     // periodically save our session state
-    connect(&(Core::instance()->syncTimer()), SIGNAL(timeout()), this, SLOT(saveSessionState()));
+    connect(Core::instance()->syncTimer(), SIGNAL(timeout()), this, SLOT(saveSessionState()));
 
     p->synchronize(_bufferSyncer);
     p->synchronize(&aliasManager());