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

List:       kde-commits
Subject:    [kdesvn/frameworks] src: KIO::NetAccess::download() -> KIO::file_copy() (taken from a commit for kat
From:       Christian Ehrlicher <Ch.Ehrlicher () gmx ! de>
Date:       2016-03-31 19:21:07
Message-ID: E1ali9T-0005rB-D9 () scm ! kde ! org
[Download RAW message or body]

Git commit efa465462a5e3e5e0bbf2050123c0109de5cdfdc by Christian Ehrlicher.
Committed on 28/03/2016 at 18:20.
Pushed by chehrlic into branch 'frameworks'.

KIO::NetAccess::download() -> KIO::file_copy() (taken from a commit for kate porting)

M  +12   -13   src/kdesvnview.cpp
M  +10   -6    src/ksvnwidgets/commitmsg_impl.cpp

http://commits.kde.org/kdesvn/efa465462a5e3e5e0bbf2050123c0109de5cdfdc

diff --git a/src/kdesvnview.cpp b/src/kdesvnview.cpp
index f019373..9b7857f 100644
--- a/src/kdesvnview.cpp
+++ b/src/kdesvnview.cpp
@@ -36,12 +36,14 @@
 #include <QFileInfo>
 #include <QProgressBar>
 #include <QSplitter>
+#include <QTemporaryFile>
 
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <QTextBrowser>
 #include <kactioncollection.h>
-#include <kio/netaccess.h>
+#include <KIO/FileCopyJob>
+#include <kjobwidgets.h>
 
 kdesvnView::kdesvnView(KActionCollection *aCollection, QWidget *parent, bool full)
     : QWidget(parent), svn::repository::RepositoryListener()
@@ -309,20 +311,20 @@ void kdesvnView::slotLoaddump()
         break;
     }
 
-    QUrl _uri = ptr->dumpFile();
+    const QUrl _uri = ptr->dumpFile();
     QString _input;
-    QString tmpfile;
-    bool networked = false;
+    QTemporaryFile tmpfile;
     if (_uri.isLocalFile()) {
-        _input = _uri.path();
+        _input = _uri.toLocalFile();
     } else {
-        networked = true;
-        if (! KIO::NetAccess::download(_uri, tmpfile, this)) {
-            KMessageBox::error(this, KIO::NetAccess::lastErrorString());
-            KIO::NetAccess::removeTempFile(tmpfile);
+        tmpfile.open();
+        KIO::FileCopyJob *job = KIO::file_copy(_uri, QUrl::fromLocalFile(tmpfile.fileName()));
+        KJobWidgets::setWindow(job, this);
+        if (!job->exec()) {
+            KMessageBox::error(this, job->errorString());
             return;
         }
-        _input = tmpfile;
+        _input = tmpfile.fileName();
     }
 
     try {
@@ -332,9 +334,6 @@ void kdesvnView::slotLoaddump()
     } catch (const svn::ClientException &e) {
         slotAppendLog(e.msg());
     }
-    if (networked && tmpfile.length() > 0) {
-        KIO::NetAccess::removeTempFile(tmpfile);
-    }
     delete dlg;
 }
 
diff --git a/src/ksvnwidgets/commitmsg_impl.cpp b/src/ksvnwidgets/commitmsg_impl.cpp
index 6bf3248..3b0a75e 100644
--- a/src/ksvnwidgets/commitmsg_impl.cpp
+++ b/src/ksvnwidgets/commitmsg_impl.cpp
@@ -27,13 +27,15 @@
 #include <klocale.h>
 #include <kconfig.h>
 #include <kurlrequesterdialog.h>
-#include <kio/netaccess.h>
 #include <kmessagebox.h>
 #include <kfile.h>
 #include <kurlrequester.h>
+#include <kjobwidgets.h>
+#include <KIO/FileCopyJob>
 
 #include <QStringList>
 #include <QSortFilterProxyModel>
+#include <QTemporaryFile>
 #include <QCheckBox>
 #include <QLabel>
 #include <QLayout>
@@ -497,12 +499,14 @@ void Commitmsg_impl::insertFile()
     if (_url.isLocalFile()) {
         insertFile(_url.path());
     } else {
-        QString tmpFile;
-        if (KIO::NetAccess::download(_url, tmpFile, this)) {
-            insertFile(tmpFile);
-            KIO::NetAccess::removeTempFile(tmpFile);
+        QTemporaryFile tf;
+        tf.open();
+        KIO::FileCopyJob *job = KIO::file_copy(_url, QUrl::fromLocalFile(tf.fileName()));
+        KJobWidgets::setWindow(job, this);
+        if (job->exec()) {
+            insertFile(tf.fileName());
         } else {
-            KMessageBox::error(this, KIO::NetAccess::lastErrorString());
+            KMessageBox::error(this, job->errorString());
         }
     }
 }

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