[Pkg-owncloud-commits] [owncloud-client] 73/219: SyncJournal: Don't use C++11 features.

[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 88b7f2e0eef4a8393f5bf2f0279eefab9840842f
Author: Christian Kamm <kamm at incasoftware.de>
Date:   Fri Sep 5 12:48:45 2014 +0200

    SyncJournal: Don't use C++11 features.
---
 src/mirall/syncjournaldb.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/mirall/syncjournaldb.cpp b/src/mirall/syncjournaldb.cpp
index b41cf80..7e5acf1 100644
--- a/src/mirall/syncjournaldb.cpp
+++ b/src/mirall/syncjournaldb.cpp
@@ -693,10 +693,11 @@ void SyncJournalDb::setDownloadInfo(const QString& file, const SyncJournalDb::Do
 
 QVector<SyncJournalDb::DownloadInfo> SyncJournalDb::getAndDeleteStaleDownloadInfos(const QSet<QString>& keep)
 {
+    QVector<SyncJournalDb::DownloadInfo> empty_result;
     QMutexLocker locker(&_mutex);
 
     if (!checkConnect()) {
-        return {};
+        return empty_result;
     }
 
     QSqlQuery query(_db);
@@ -706,7 +707,7 @@ QVector<SyncJournalDb::DownloadInfo> SyncJournalDb::getAndDeleteStaleDownloadInf
     if (!query.exec()) {
         QString err = query.lastError().text();
         qDebug() << "Error creating prepared statement: " << query.lastQuery() << ", Error:" << err;
-        return {};
+        return empty_result;
     }
 
     QStringList superfluousPaths;
@@ -723,7 +724,7 @@ QVector<SyncJournalDb::DownloadInfo> SyncJournalDb::getAndDeleteStaleDownloadInf
     }
 
     if (!deleteBatch(*_deleteDownloadInfoQuery, superfluousPaths, "downloadinfo"))
-        return {};
+        return empty_result;
 
     return deleted_entries;
 }

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