Differential D20739 Diff 57414 src/filemetadatautil.cpp

Changeset View

Standalone View

View Options

src/filemetadatautil.cpp

Show All 15 Lines
16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * 16​ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, *
17 * Boston, MA 02110-1301, USA. * 17​ * Boston, MA 02110-1301, USA. *
18 *****************************************************************************/ 18​ *****************************************************************************/
19 19​
20#include "filemetadatautil_p.h" 20​#include "filemetadatautil_p.h"
21#include <KFileMetaData/UserMetaData> 21​#include <KFileMetaData/UserMetaData>
22#include <KFileMetaData/PropertyInfo> 22​#include <KFileMetaData/PropertyInfo>
23 23​
24​#include <algorithm>
25​
24namespace Baloo 26​namespace Baloo
25{ 27​{
26namespace Private 28​namespace Private
27{ 29​{
28 30​
29QVariantMap convertUserMetaData(const KFileMetaData::UserMetaData& metaData) 31​QVariantMap convertUserMetaData(const KFileMetaData::UserMetaData& metaData)
30{ 32​{
31 QVariantMap properties; 33​ QVariantMap properties;
Show All 19 Lines
51 } 53​ }
52 54​
53 return properties; 55​ return properties;
54} 56​}
55 57​
56QVariantMap toNamedVariantMap(const KFileMetaData::PropertyMap& propMap) 58​QVariantMap toNamedVariantMap(const KFileMetaData::PropertyMap& propMap)
57{ 59​{
58 QVariantMap map; 60​ QVariantMap map;
59 KFileMetaData::PropertyMap::const_iterator it = propMap.constBegin(); 61​ if (propMap.isEmpty()) {
60 for (; it != propMap.constEnd(); it++) { 62​ return map;
61 KFileMetaData::PropertyInfo pi(it.key()); 63​ }
62 map.insertMulti(pi.name(), it.value()); 64​
65​ using entry = std::pair<const KFileMetaData::Property::Property&, const QVariant&>;
66​
67​ auto begin = propMap.constKeyValueBegin();
68​ auto rangeEnd = propMap.constKeyValueEnd();
brunsUnsubmitted
Done

no longer needed here, rangeEnd is set in the loop.

bruns: no longer needed here, rangeEnd is set in the loop.
69​
70​ while (begin != propMap.constKeyValueEnd()) {
71​ auto key = (*begin).first;
72​ KFileMetaData::PropertyInfo property(key);
73​ rangeEnd = std::find_if(begin, propMap.constKeyValueEnd(),
74​ [key](const entry& e) { return e.first != key; });
75​
76​ auto distance = std::distance(begin, rangeEnd);
77​ if (distance > 1) {
78​ QVariantList list;
79​ list.reserve(static_cast<int>(distance));
80​ std::for_each(begin, rangeEnd, [&list](const entry& s) { list.append(s.second); });
81​ map.insert(property.name(), list);
82​ } else {
83​ map.insert(property.name(), (*begin).second);
84​ }
85​ begin = rangeEnd;
63 } 86​ }
64 87​
65 return map; 88​ return map;
66} 89​}
67 90​
68} // namespace KFMPrivate 91​} // namespace KFMPrivate
69} // namespace Baloo 92​} // namespace Baloo