[Pkg-owncloud-commits] [owncloud-client] 44/171: Do not use nullptr, old compilers die on it.

[Sandro Knauß]

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

hefee-guest pushed a commit to annotated tag upstream/2.1.1+dfsg
in repository owncloud-client.

commit a759ba1d9e66f439d804c7929fa9058b6d653a67
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Tue Dec 22 15:07:51 2015 +0100

    Do not use nullptr, old compilers die on it.
---
 doc/ocdoc             | 2 +-
 src/gui/folderman.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/ocdoc b/doc/ocdoc
index b721861..a8fc638 160000
--- a/doc/ocdoc
+++ b/doc/ocdoc
@@ -1 +1 @@
-Subproject commit b7218616920517c020837648230b0b9ed502bc08
+Subproject commit a8fc638c26dd47925e66f05fb87cface5dbbbd81
diff --git a/src/gui/folderman.cpp b/src/gui/folderman.cpp
index 6ad1fa0..e619545 100644
--- a/src/gui/folderman.cpp
+++ b/src/gui/folderman.cpp
@@ -672,7 +672,7 @@ void FolderMan::slotStartScheduledFolderSync()
     }
 
     // Find the first folder in the queue that can be synced.
-    Folder* f = nullptr;
+    Folder* f = 0;
     while( !_scheduleQueue.isEmpty() ) {
         f = _scheduleQueue.dequeue();
         Q_ASSERT(f);

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