Implement DolphinView::simplifiedSelectedUrls()

Makes it possible to trash and delete items.

diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp
index c2f49f70518ffb74770d00035eebf486dd45b9c2..bfe45d647b759ccc682bf319cd2a018a15586a37 100644 (file)
--- a/src/kitemviews/kfileitemmodel.cpp
+++ b/src/kitemviews/kfileitemmodel.cpp
@@ -179,7 +179,7 @@ QMimeData* KFileItemModel::createMimeData(const QSet<int>& indexes) const
     }
 
     const bool different = canUseMostLocalUrls && mostLocalUrls != urls;
     }
 
     const bool different = canUseMostLocalUrls && mostLocalUrls != urls;

-    urls = KDirModel::simplifiedUrlList(urls);
+    urls = KDirModel::simplifiedUrlList(urls); // TODO: Check if we still need KDirModel for this in KDE 5.0

     if (different) {
         mostLocalUrls = KDirModel::simplifiedUrlList(mostLocalUrls);
         urls.populateMimeData(mostLocalUrls, data);
     if (different) {
         mostLocalUrls = KDirModel::simplifiedUrlList(mostLocalUrls);
         urls.populateMimeData(mostLocalUrls, data);

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index da8e93c800b046e191fbe5cbc0d4c9cf22fdf036..678111eca30efe5ff317bb1e71c2fcf345bc12a5 100644 (file)
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -32,6 +32,7 @@
 #include <KActionCollection>
 #include <KColorScheme>
 #include <KDirLister>
 #include <KActionCollection>
 #include <KColorScheme>
 #include <KDirLister>

+#include <KDirModel>

 #include <KIconEffect>
 #include <KFileItem>
 #include <KFileItemListProperties>
 #include <KIconEffect>
 #include <KFileItem>
 #include <KFileItemListProperties>


@@ -1172,18 +1173,17 @@ void DolphinView::updateZoomLevel(int oldZoomLevel)
 
 KUrl::List DolphinView::simplifiedSelectedUrls() const
 {
 
 KUrl::List DolphinView::simplifiedSelectedUrls() const
 {

-    Q_ASSERT(false); // TODO

     KUrl::List urls;
     KUrl::List urls;

-/*
+

     const KFileItemList items = selectedItems();
     foreach (const KFileItem &item, items) {
         urls.append(item.url());
     }
 
     const KFileItemList items = selectedItems();
     foreach (const KFileItem &item, items) {
         urls.append(item.url());
     }
 

-

     if (itemsExpandable()) {
     if (itemsExpandable()) {

+        // TODO: Check if we still need KDirModel for this in KDE 5.0

         urls = KDirModel::simplifiedUrlList(urls);
         urls = KDirModel::simplifiedUrlList(urls);

-    }*/
+    }

 
     return urls;
 }
 
     return urls;
 }