[Pkg-owncloud-commits] [owncloud-client] 01/89: Fix windows rename of temporary files

Sandro Knauß hefee-guest at moszumanska.debian.org
Sat Dec 14 01:02:27 UTC 2013


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 1f5c4bde148e7824cff7688125999e9f2c634775
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Tue Dec 3 16:10:44 2013 +0100

    Fix windows rename of temporary files
---
 src/mirall/owncloudpropagator.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mirall/owncloudpropagator.cpp b/src/mirall/owncloudpropagator.cpp
index 238681f..2294d78 100644
--- a/src/mirall/owncloudpropagator.cpp
+++ b/src/mirall/owncloudpropagator.cpp
@@ -786,7 +786,7 @@ void PropagateDownloadFile::start()
 
     csync_win32_set_file_hidden(tmpFileName.toUtf8().constData(), false);
 
-#ifndef QT_OS_WIN
+#ifndef Q_OS_WIN
     bool success;
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
     success = tmpFile.fileEngine()->rename(fn);
@@ -804,7 +804,7 @@ void PropagateDownloadFile::start()
         done(SyncFileItem::NormalError, tmpFile.errorString());
         return;
     }
-#else //QT_OS_WIN
+#else //Q_OS_WIN
     if (::MoveFileEx((wchar_t*)tmpFile.fileName().utf16(),
                             (wchar_t*)QString(_localDir + item._file).utf16(),
                         MOVEFILE_REPLACE_EXISTING) != 0) {

-- 
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