From: arnav dhamija Date: Sun, 25 Sep 2016 14:16:22 +0000 (+0530) Subject: Used KUrlMimeData::setUrls for kfileitemmodel's createMimeData for implementing the... X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/1710304e9ba926d2aec4226d00974b826f9bcbc0 Used KUrlMimeData::setUrls for kfileitemmodel's createMimeData for implementing the upcoming stash:/ ioslave --- 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 +#include + #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; } -