diff options
| -rw-r--r-- | src/kitemviews/kfileitemmodel.cpp | 2 | ||||
| -rw-r--r-- | src/views/dolphinview.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp index c2f49f705..bfe45d647 100644 --- 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; - 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); diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp index da8e93c80..678111eca 100644 --- a/src/views/dolphinview.cpp +++ b/src/views/dolphinview.cpp @@ -32,6 +32,7 @@ #include <KActionCollection> #include <KColorScheme> #include <KDirLister> +#include <KDirModel> #include <KIconEffect> #include <KFileItem> #include <KFileItemListProperties> @@ -1172,18 +1173,17 @@ void DolphinView::updateZoomLevel(int oldZoomLevel) KUrl::List DolphinView::simplifiedSelectedUrls() const { - Q_ASSERT(false); // TODO KUrl::List urls; -/* + const KFileItemList items = selectedItems(); foreach (const KFileItem &item, items) { urls.append(item.url()); } - if (itemsExpandable()) { + // TODO: Check if we still need KDirModel for this in KDE 5.0 urls = KDirModel::simplifiedUrlList(urls); - }*/ + } return urls; } |