Use a constant for ConnectionValidator::DefaultCallingIntervalMsec

So there is no runtime initialization

diff --git a/src/gui/application.cpp b/src/gui/application.cpp
index 90eca8a178a24aec978e969552f2b780d7b5d84b..6d3b6cd39f91f58a8d726ccfd6710746879d998f 100644 (file)
--- a/src/gui/application.cpp
+++ b/src/gui/application.cpp
@@ -182,7 +182,7 @@ Application::Application(int &argc, char **argv) :
 
     // startup procedure.
     connect(&_checkConnectionTimer, SIGNAL(timeout()), this, SLOT(slotCheckConnection()));
-    _checkConnectionTimer.setInterval(ConnectionValidator::defaultCallingIntervalMsec()); // check for connection every 32 seconds.
+    _checkConnectionTimer.setInterval(ConnectionValidator::DefaultCallingIntervalMsec); // check for connection every 32 seconds.
     _checkConnectionTimer.start();
     // Also check immediately
     QTimer::singleShot( 0, this, SLOT( slotCheckConnection() ));

diff --git a/src/libsync/connectionvalidator.cpp b/src/libsync/connectionvalidator.cpp
index ca4e79705a042ad5422578da8dbd87211875b3d0..f8c11f9c9756fa633ef43d9018f00daa97b97801 100644 (file)
--- a/src/libsync/connectionvalidator.cpp
+++ b/src/libsync/connectionvalidator.cpp
@@ -25,7 +25,7 @@ namespace OCC {
 
 // Make sure the timeout for this job is less than how often we get called
 // This makes sure we get tried often enough without "ConnectionValidator already running"
-static qint64 timeoutToUseMsec = qMax(qint64(1000), ConnectionValidator::defaultCallingIntervalMsec() - 5*1000);
+static qint64 timeoutToUseMsec = qMax(1000, ConnectionValidator::DefaultCallingIntervalMsec - 5*1000);
 
 ConnectionValidator::ConnectionValidator(AccountPtr account, QObject *parent)
     : QObject(parent),

diff --git a/src/libsync/connectionvalidator.h b/src/libsync/connectionvalidator.h
index eb57a293d08b3a7af42fc2d1d451cbef6553c1af..e1264628acaf1db2a791d3c9bfa624bfb4d8a8ac 100644 (file)
--- a/src/libsync/connectionvalidator.h
+++ b/src/libsync/connectionvalidator.h
@@ -85,7 +85,7 @@ public:
     static QString statusString( Status );
 
     // How often should the Application ask this object to check for the connection?
-    static qint64 defaultCallingIntervalMsec() { return 32 * 1000;}
+    enum { DefaultCallingIntervalMsec = 32 * 1000 };
 
 public slots:
     /// Checks the server and the authentication.