[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kio] src/core: kio: Fix conditions with QFile::rename return value
From:       Boris Egorov <egorov () linux ! com>
Date:       2015-05-03 12:39:31
Message-ID: E1YotBD-00043x-Q3 () scm ! kde ! org
[Download RAW message or body]

Git commit 36400c2f6e038e5028bf6347108270ec50cb1de2 by Boris Egorov.
Committed on 03/05/2015 at 12:26.
Pushed by egorov into branch 'master'.

kio: Fix conditions with QFile::rename return value

See my previous commit: e5c3f7eda489.

I grepped kf5 sources to search for more issues with QFile::rename
return value. This patch fixes remaining ones.

REVIEW: 123598
CHANGELOG: kio: Fix conditions with QFile::rename return value

M  +3    -3    src/core/copyjob.cpp

http://commits.kde.org/kio/36400c2f6e038e5028bf6347108270ec50cb1de2

diff --git a/src/core/copyjob.cpp b/src/core/copyjob.cpp
index 48d383b..b0d054a 100644
--- a/src/core/copyjob.cpp
+++ b/src/core/copyjob.cpp
@@ -1823,15 +1823,15 @@ void CopyJobPrivate::slotResultRenaming(KJob *job)
                     tmpFile.close();
                     tmpFile.remove();
                     //qDebug() << "QTemporaryFile using" << _tmp << "as \
                intermediary";
-                    if (QFile::rename(_src, _tmp) == 0) {
+                    if (QFile::rename(_src, _tmp)) {
                         //qDebug() << "Renaming" << _src << "to" << _tmp << \
                "succeeded";
-                        if (!QFile::exists(_dest) && QFile::rename(_tmp, _dest) == \
0) { +                        if (!QFile::exists(_dest) && QFile::rename(_tmp, \
_dest)) {  err = 0;
                             org::kde::KDirNotify::emitFileRenamed(m_currentSrcURL, \
dest);  } else {
                             //qDebug() << "Didn't manage to rename" << _tmp << "to" \
<< _dest << ", reverting";  // Revert back to original name!
-                            if (QFile::rename(_tmp, _src) != 0) {
+                            if (!QFile::rename(_tmp, _src)) {
                                 qWarning() << "Couldn't rename" << _tmp << "back to" \
<< _src << '!';  // Severe error, abort
                                 q->Job::slotResult(job); // will set the error and \
emit result(this)


[prev in list] [next in list] [prev in thread] [next in thread]