[Pkg-owncloud-commits] [owncloud-client] 20/211: Use climits for ULONG_MAX rather than modern C++ option

[Sandro Knauß]

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 32fea6523fa77b4e7f24826ecea80d979c77f3df
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Thu Oct 9 11:03:07 2014 +0200

    Use climits for ULONG_MAX rather than modern C++ option
---
 src/mirall/protocolwidget.cpp | 4 +++-
 src/mirall/syncengine.cpp     | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/mirall/protocolwidget.cpp b/src/mirall/protocolwidget.cpp
index d44c8bc..28c8426 100644
--- a/src/mirall/protocolwidget.cpp
+++ b/src/mirall/protocolwidget.cpp
@@ -29,6 +29,8 @@
 
 #include "ui_protocolwidget.h"
 
+#include <climits>
+
 namespace Mirall {
 
 ProtocolWidget::ProtocolWidget(QWidget *parent) :
@@ -262,7 +264,7 @@ void ProtocolWidget::computeResyncButtonEnabled()
 
 void ProtocolWidget::slotProgressInfo( const QString& folder, const Progress::Info& progress )
 {
-    if( progress._completedFileCount == std::numeric_limits<quint64>::max() ) {
+    if( progress._completedFileCount == ULLONG_MAX ) {
         // The sync is restarting, clean the old items
         cleanIgnoreItems(folder);
         computeResyncButtonEnabled();
diff --git a/src/mirall/syncengine.cpp b/src/mirall/syncengine.cpp
index 15e354f..8354fdb 100644
--- a/src/mirall/syncengine.cpp
+++ b/src/mirall/syncengine.cpp
@@ -29,6 +29,7 @@
 #include <unistd.h>
 #endif
 
+#include <climits>
 #include <assert.h>
 
 #include <QDebug>
@@ -656,7 +657,7 @@ void SyncEngine::slotDiscoveryJobFinished(int discoveryResult)
 
     // To announce the beginning of the sync
     emit aboutToPropagate(_syncedItems);
-    _progressInfo._completedFileCount = std::numeric_limits<quint64>::max(); // indicate the start with max
+    _progressInfo._completedFileCount = ULLONG_MAX; // indicate the start with max
     emit transmissionProgress(_progressInfo);
     _progressInfo._completedFileCount = 0;
 

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