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

List:       kde-commits
Subject:    [gwenview/bring-back-importer] importer: Use KJobWidgets::setWindow
From:       Aurélien Gâteau <agateau () kde ! org>
Date:       2016-11-04 8:08:17
Message-ID: E1c2ZXt-0007GC-TP () code ! kde ! org
[Download RAW message or body]

Git commit 01c02bcbbfcd70541e689a8fae0d89ddad714e69 by Aurélien Gâteau.
Committed on 04/11/2016 at 07:24.
Pushed by gateau into branch 'bring-back-importer'.

Use KJobWidgets::setWindow

M  +3    -10   importer/importer.cpp

http://commits.kde.org/gwenview/01c02bcbbfcd70541e689a8fae0d89ddad714e69

diff --git a/importer/importer.cpp b/importer/importer.cpp
index b606360..8f2f31d 100644
--- a/importer/importer.cpp
+++ b/importer/importer.cpp
@@ -34,6 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 #include <KIO/Job>
 #include <KIO/JobUiDelegate>
 #include <KIO/NetAccess>
+#include <KJobWidgets>
 #include <KStandardDirs>
 
 // stdc++
@@ -101,11 +102,7 @@ struct ImporterPrivate
         QUrl dst = mTempImportDirUrl;
         dst.setPath(dst.path() + '/' + mCurrentUrl.fileName());
         KIO::Job* job = KIO::copy(mCurrentUrl, dst, KIO::HideProgressInfo);
-        /* KF5 FIXME
-        if (job->ui()) {
-            job->ui()->setWindow(mAuthWindow);
-        }
-        */
+        KJobWidgets::setWindow(job, mAuthWindow);
         QObject::connect(job, SIGNAL(result(KJob*)),
                          q, SLOT(slotCopyDone(KJob*)));
         QObject::connect(job, SIGNAL(percent(KJob*,ulong)),
@@ -207,11 +204,7 @@ void Importer::slotCopyDone(KJob* _job)
 void Importer::finalizeImport()
 {
     KIO::Job* job = KIO::del(d->mTempImportDirUrl, KIO::HideProgressInfo);
-    /* KF5 FIXME
-    if (job->ui()) {
-        job->ui()->setWindow(d->mAuthWindow);
-    }
-    */
+    KJobWidgets::setWindow(job, d->mAuthWindow);
     importFinished();
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]