diff options
| author | arnav dhamija <[email protected]> | 2016-09-25 19:46:22 +0530 |
|---|---|---|
| committer | arnav dhamija <[email protected]> | 2016-09-25 19:46:22 +0530 |
| commit | 1710304e9ba926d2aec4226d00974b826f9bcbc0 (patch) | |
| tree | 16fe472cc13677496793c2a4967097e978379ef4 /src | |
| parent | 478de351757965af05c9282df72f5720d3f53f31 (diff) | |
Used KUrlMimeData::setUrls for kfileitemmodel's createMimeData for implementing the upcoming stash:/ ioslave
Diffstat (limited to 'src')
| -rw-r--r-- | src/kitemviews/kfileitemmodel.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp index 1f94972c2..05f85a633 100644 --- a/src/kitemviews/kfileitemmodel.cpp +++ b/src/kitemviews/kfileitemmodel.cpp @@ -24,6 +24,8 @@ #include "dolphin_generalsettings.h" #include <KLocalizedString> +#include <KUrlMimeData> + #include "dolphindebug.h" #include "private/kfileitemmodelsortalgorithm.h" @@ -265,7 +267,7 @@ QMimeData* KFileItemModel::createMimeData(const KItemSet& indexes) const lastAddedItem = itemData; const KFileItem& item = itemData->item; if (!item.isNull()) { - urls << item.targetUrl(); + urls << item.url(); bool isLocal; mostLocalUrls << item.mostLocalUrl(isLocal); @@ -275,13 +277,7 @@ QMimeData* KFileItemModel::createMimeData(const KItemSet& indexes) const } } - const bool different = canUseMostLocalUrls && mostLocalUrls != urls; - if (different) { - data->setUrls(mostLocalUrls); - } else { - data->setUrls(urls); - } - + KUrlMimeData::setUrls(urls, mostLocalUrls, data); return data; } @@ -2324,4 +2320,3 @@ bool KFileItemModel::isConsistent() const return true; } - |
