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

List:       kde-commits
Subject:    [krita/krita/4.1] libs/ui: Revert "Temporary workaround for QTBUG-57299"
From:       Boudewijn Rempt <null () kde ! org>
Date:       2018-09-07 14:15:56
Message-ID: E1fyHYC-0003Xd-Hj () code ! kde ! org
[Download RAW message or body]

Git commit 1aeda24719aec310cec44c33b6cfe2fc6687d322 by Boudewijn Rempt.
Committed on 07/09/2018 at 12:52.
Pushed by rempt into branch 'krita/4.1'.

Revert "Temporary workaround for QTBUG-57299"

This reverts commit 0f36057d79b0390084c7e68e65187d12cbf732ca.

M  +5    -45   libs/ui/KisImportExportManager.cpp

https://commits.kde.org/krita/1aeda24719aec310cec44c33b6cfe2fc6687d322

diff --git a/libs/ui/KisImportExportManager.cpp b/libs/ui/KisImportExportManager.cpp
index ef98af494cd..df40e7ffd4c 100644
--- a/libs/ui/KisImportExportManager.cpp
+++ b/libs/ui/KisImportExportManager.cpp
@@ -35,7 +35,6 @@
 #include <QGroupBox>
 #include <QFuture>
 #include <QtConcurrent>
-#include <QFileInfo>
 
 #include <klocalizedstring.h>
 #include <ksqueezedtextlabel.h>
@@ -608,67 +607,28 @@ KisImportExportFilter::ConversionStatus \
KisImportExportManager::doExport(const Q  return status;
 }
 
-// Temporary workaround until QTBUG-57299 is fixed.
-#ifdef Q_OS_WIN
-#define USE_QSAVEFILE
-#endif
-
 KisImportExportFilter::ConversionStatus KisImportExportManager::doExportImpl(const \
QString &location, QSharedPointer<KisImportExportFilter> filter, \
KisPropertiesConfigurationSP exportConfiguration)  {
-#ifdef USE_QSAVEFILE
     QSaveFile file(location);
     file.setDirectWriteFallback(true);
-    if (filter->supportsIO() && !file.open(QFile::WriteOnly)) {
 
-#else
-    QFileInfo fi(location);
-    QTemporaryFile file(fi.absolutePath() + ".XXXXXX.kra");
-    if (filter->supportsIO() && !file.open()) {
-#endif
-        QString error = file.errorString();
-        if (error.isEmpty()) {
-            error = i18n("Could not open %1 for writing.", location);
-        }
-        m_document->setErrorMessage(error);
-#ifdef USE_QSAVEFILE
+    if (filter->supportsIO() && !file.open(QFile::WriteOnly)) {
+        m_document->setErrorMessage(file.errorString());
         file.cancelWriting();
-#endif
         return KisImportExportFilter::CreationError;
     }
 
-    KisImportExportFilter::ConversionStatus status = filter->convert(m_document, \
&file, exportConfiguration); +    KisImportExportFilter::ConversionStatus status =
+            filter->convert(m_document, &file, exportConfiguration);
 
     if (filter->supportsIO()) {
         if (status != KisImportExportFilter::OK) {
-#ifdef USE_QSAVEFILE
             file.cancelWriting();
-#endif
         } else {
-#ifdef USE_QSAVEFILE
             if (!file.commit()) {
-                QString error = file.errorString();
-                if (error.isEmpty()) {
-                    error = i18n("Could not write to %1.", location);
-                }
-                if (m_document->errorMessage().isEmpty()) {
-                    m_document->setErrorMessage(error);
-                }
+                m_document->setErrorMessage(file.errorString());
                 status = KisImportExportFilter::CreationError;
             }
-#else
-            file.flush();
-            file.close();
-            QFile target(location);
-            if (target.exists()) {
-                // There should already be a .kra~ backup
-                target.remove();
-            }
-            if (!file.copy(location)) {
-                file.setAutoRemove(false);
-                m_document->setErrorMessage(i18n("Could not copy %1 to its final \
                location %2", file.fileName(), location));
-                return KisImportExportFilter::CreationError;
-            }
-#endif
         }
     }
     return status;


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