diff options
author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-01-02 18:08:49 +0000 |
---|---|---|
committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-01-02 18:08:49 +0000 |
commit | 98c3f05e07b419212d0f6ba49da7ff81fd62aa58 (patch) | |
tree | c8514b7492f7d792a3aba2902a0378f800487189 /user/dolphin/baloo.patch | |
parent | 59e9f35bfbb7edb5e80d0064f580bc0a03243916 (diff) | |
download | packages-98c3f05e07b419212d0f6ba49da7ff81fd62aa58.tar.gz packages-98c3f05e07b419212d0f6ba49da7ff81fd62aa58.tar.bz2 packages-98c3f05e07b419212d0f6ba49da7ff81fd62aa58.tar.xz packages-98c3f05e07b419212d0f6ba49da7ff81fd62aa58.zip |
user/[KDE System]: Bump to 19.12.0
Diffstat (limited to 'user/dolphin/baloo.patch')
-rw-r--r-- | user/dolphin/baloo.patch | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/user/dolphin/baloo.patch b/user/dolphin/baloo.patch deleted file mode 100644 index 48efb30ed..000000000 --- a/user/dolphin/baloo.patch +++ /dev/null @@ -1,53 +0,0 @@ -Subject: Revert "handle maps with multiple or single entries from Baloo" - -This reverts commit 36b61838a27df32824c58f383453bb94b730b52c. - -diff --git a/src/kitemviews/private/kbaloorolesprovider.cpp b/src/kitemviews/private/kbaloorolesprovider.cpp -index 469f079..f367154 100644 ---- a/src/kitemviews/private/kbaloorolesprovider.cpp -+++ b/src/kitemviews/private/kbaloorolesprovider.cpp -@@ -56,34 +56,18 @@ QHash<QByteArray, QVariant> KBalooRolesProvider::roleValues(const Baloo::File& f - { - QHash<QByteArray, QVariant> values; - -+ QMapIterator<KFileMetaData::Property::Property, QVariant> it(file.properties()); -+ while (it.hasNext()) { -+ it.next(); -- using entry = std::pair<const KFileMetaData::Property::Property&, const QVariant&>; -- -- const auto& propMap = file.properties(); -- auto rangeBegin = propMap.constKeyValueBegin(); -- -- while (rangeBegin != propMap.constKeyValueEnd()) { -- auto key = (*rangeBegin).first; -- const KFileMetaData::PropertyInfo propertyInfo(key); -- const QByteArray role = roleForProperty(propertyInfo.name()); -- -- auto rangeEnd = std::find_if(rangeBegin, propMap.constKeyValueEnd(), -- [key](const entry& e) { return e.first != key; }); - -+ const KFileMetaData::PropertyInfo pi(it.key()); -+ const QString property = pi.name(); -+ const QByteArray role = roleForProperty(property); - if (role.isEmpty() || !roles.contains(role)) { -- rangeBegin = rangeEnd; - continue; - } - -+ values.insert(role, pi.formatAsDisplayString(it.value())); -- auto distance = std::distance(rangeBegin, rangeEnd); -- if (distance > 1) { -- QVariantList list; -- list.reserve(static_cast<int>(distance)); -- std::for_each(rangeBegin, rangeEnd, [&list](const entry& s) { list.append(s.second); }); -- values.insert(role, propertyInfo.formatAsDisplayString(list)); -- } else { -- values.insert(role, propertyInfo.formatAsDisplayString((*rangeBegin).second)); -- } -- rangeBegin = rangeEnd; - } - - KFileMetaData::UserMetaData md(file.path()); --- -cgit v1.1 - |