Merge lp:~artmello/ubuntu-ui-extras/ubuntu-ui-extras-fix_1524973 into lp:ubuntu-ui-extras

[Arthur Mello]

After editing a photo modify the original file instead of removing/moving it

After editing a photo modify the original file instead of removing/moving it

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:73
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-extras-ci/75/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-extras-vivid-amd64-ci/36
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-extras-vivid-armhf-ci/36
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-extras-vivid-armhf-ci/36/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-extras-ci/75/rebuild

review: Approve (continuous-integration)

=== modified file 'modules/Ubuntu/Components/Extras/plugin/photoeditor/file-utils.cpp'
--- modules/Ubuntu/Components/Extras/plugin/photoeditor/file-utils.cpp	2014-11-25 15:44:31 +0000
+++ modules/Ubuntu/Components/Extras/plugin/photoeditor/file-utils.cpp	2015-12-11 17:35:57 +0000
@@ -69,7 +69,23 @@
 {
     if (sourceFile.isEmpty() || destinationFile.isEmpty()) return false;
 
-    if (QFileInfo(destinationFile).exists()) QFile::remove(destinationFile);
+    if (QFileInfo(destinationFile).exists()) {
+        QFile src(sourceFile);
+        QFile dst(destinationFile);
+
+        if (!src.open(QIODevice::ReadOnly) || !dst.open(QIODevice::WriteOnly)) {
+            return false;
+        }
+
+        if (dst.write(src.readAll()) < 0) {
+            return false;
+        }
+
+        src.close();
+        dst.close();
+        return true;
+    }
+
     return QFile::rename(sourceFile, destinationFile);
 }