Used KUrlMimeData::setUrls for kfileitemmodel's createMimeData for implementing the upcoming stash:/ ioslave

This commit is contained in:
arnav dhamija 2016-09-25 19:33:32 +05:30
parent 28f3b29695
commit ccd0a74eed

View file

@ -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;
}