From 2f045c60109e0a5811f68bcce617236e3478e402 Mon Sep 17 00:00:00 2001
From: Alex Richardson <arichardson.kde@gmail.com>
Date: Sun, 6 Apr 2014 03:32:55 +0200
Subject: Allow compiling Dolphin with KF5

This does not work properly yet, there are probably quite a few bad signal/
slot connections due to KUrl -> QUrl. However dolphin starts without
crashing.

Accessibility is not ported since that changed quite a lot from Qt4 -> Qt5
and I have no idea how it is supposed to be used.

This is the first commit for review 117395
---
 src/views/dolphinview.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'src/views/dolphinview.cpp')

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 9f5f48a86..02a844c2b 100644
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -32,6 +32,8 @@
 #include <QItemSelection>
 #include <QTimer>
 #include <QScrollBar>
+#include <QPointer>
+#include <QMenu>
 
 #include <KDesktopFile>
 #include <KProtocolManager>
@@ -55,7 +57,9 @@
 #include <KIO/PreviewJob>
 #include <KJob>
 #include <KMenu>
+#include <KGlobal>
 #include <KMessageBox>
+#include <KJobWidgets>
 #include <konq_fileitemcapabilities.h>
 #include <konq_operations.h>
 #include <konqmimedata.h>
@@ -295,7 +299,7 @@ void DolphinView::setHiddenFilesShown(bool show)
 
     const KFileItemList itemList = selectedItems();
     m_selectedUrls.clear();
-    m_selectedUrls = itemList.urlList();
+    m_selectedUrls = KUrl::List(itemList.urlList());
 
     ViewProperties props(viewPropertiesUrl());
     props.setHiddenFilesShown(show);
@@ -472,7 +476,7 @@ void DolphinView::reload()
 
     const KFileItemList itemList = selectedItems();
     m_selectedUrls.clear();
-    m_selectedUrls = itemList.urlList();
+    m_selectedUrls = KUrl::List(itemList.urlList());
 
     setUrl(url());
     loadDirectory(url(), true);
@@ -684,7 +688,7 @@ void DolphinView::deleteSelectedItems()
     if (del) {
         KIO::Job* job = KIO::del(list);
         if (job->ui()) {
-            job->ui()->setWindow(this);
+            KJobWidgets::setWindow(job, this);
         }
         connect(job, SIGNAL(result(KJob*)),
                 this, SLOT(slotDeleteFileFinished(KJob*)));
@@ -1091,7 +1095,7 @@ void DolphinView::slotAboutToCreate(const KUrl::List& urls)
             markUrlAsCurrent(urls.first());
             m_markFirstNewlySelectedItemAsCurrent = false;
         }
-        m_selectedUrls << KDirModel::simplifiedUrlList(urls);
+        m_selectedUrls << KUrl::List(KDirModel::simplifiedUrlList(urls));
     }
 }
 
-- 
cgit v1.3