[Pkg-owncloud-commits] [owncloud-client] 374/498: ConfigFile: Let updateCheckInterval return int instead of quint64.

Sandro Knauß hefee-guest at moszumanska.debian.org
Tue Aug 11 14:49:08 UTC 2015


This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 21f7cea609ed126a51220a90f286e5be5139328c
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Wed Jul 22 13:42:54 2015 +0200

    ConfigFile: Let updateCheckInterval return int instead of quint64.
    
    QTimer wants that in setInterval()
---
 src/libsync/configfile.cpp | 8 ++++----
 src/libsync/configfile.h   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/libsync/configfile.cpp b/src/libsync/configfile.cpp
index fd7b874..eb0fec7 100644
--- a/src/libsync/configfile.cpp
+++ b/src/libsync/configfile.cpp
@@ -382,17 +382,17 @@ quint64 ConfigFile::forceSyncInterval(const QString& connection) const
     return interval;
 }
 
-quint64 ConfigFile::updateCheckInterval( const QString& connection ) const
+int ConfigFile::updateCheckInterval( const QString& connection ) const
 {
     QString con( connection );
     if( connection.isEmpty() ) con = defaultConnection();
     QSettings settings(configFile(), QSettings::IniFormat);
     settings.beginGroup( con );
 
-    quint64 defaultInterval = 1000*60*60*10; // ten hours
-    quint64 interval = settings.value( QLatin1String(updateCheckIntervalC), defaultInterval ).toULongLong();
+    int defaultInterval = 1000*60*60*10; // ten hours
+    int interval = settings.value( QLatin1String(updateCheckIntervalC), defaultInterval ).toInt();
 
-    quint64 minInterval = 1000*60*5;
+    int minInterval = 1000*60*5;
     if( interval < minInterval) {
         qDebug() << "Update check interval less than five minutes, setting " << minInterval;
         interval = minInterval;
diff --git a/src/libsync/configfile.h b/src/libsync/configfile.h
index 43713fe..72f43d9 100644
--- a/src/libsync/configfile.h
+++ b/src/libsync/configfile.h
@@ -113,7 +113,7 @@ public:
     void restoreGeometry(QWidget *w);
 
     // how often the check about new versions runs, default two hours
-    quint64 updateCheckInterval( const QString& connection = QString() ) const;
+    int updateCheckInterval( const QString& connection = QString() ) const;
 
     bool skipUpdateCheck( const QString& connection = QString() ) const;
     void setSkipUpdateCheck( bool, const QString& );

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git



More information about the Pkg-owncloud-commits mailing list