1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
|
From d1dbb051b96affb98f3b711572974c403b7023ef Mon Sep 17 00:00:00 2001
From: Chris Adams <chris.adams@jollamobile.com>
Date: Fri, 17 May 2019 16:07:24 +1000
Subject: [PATCH 29/32] Provide interface for accessing all extended metadata
from collections
Task-number: QTBUG-75550
Change-Id: Ic07dccd5aa46174a235f24cc5c7fc60c8039348f
Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
Signed-off-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
---
src/contacts/qcontactcollection.cpp | 8 ++++++++
src/contacts/qcontactcollection.h | 1 +
src/organizer/qorganizercollection.cpp | 8 ++++++++
src/organizer/qorganizercollection.h | 1 +
.../qcontactcollection/tst_qcontactcollection.cpp | 2 ++
.../qorganizercollection/tst_qorganizercollection.cpp | 2 ++
6 files changed, 22 insertions(+)
diff --git a/src/contacts/qcontactcollection.cpp b/src/contacts/qcontactcollection.cpp
index da94a58b..fd8c0335 100644
--- a/src/contacts/qcontactcollection.cpp
+++ b/src/contacts/qcontactcollection.cpp
@@ -209,6 +209,14 @@ QVariant QContactCollection::extendedMetaData(const QString &key) const
return d->m_metaData.value(QContactCollection::KeyExtended).toMap().value(key);
}
+/*!
+ Returns all extended metadata of the collection.
+ */
+QVariantMap QContactCollection::extendedMetaData() const
+{
+ return d->m_metaData.value(QContactCollection::KeyExtended).toMap();
+}
+
/*!
Returns the meta data of the collection for the given \a key.
*/
diff --git a/src/contacts/qcontactcollection.h b/src/contacts/qcontactcollection.h
index 5a0fd234..1a589b30 100644
--- a/src/contacts/qcontactcollection.h
+++ b/src/contacts/qcontactcollection.h
@@ -87,6 +87,7 @@ public:
void setExtendedMetaData(const QString &key, const QVariant &value);
QVariant extendedMetaData(const QString &key) const;
+ QVariantMap extendedMetaData() const;
private:
friend Q_CONTACTS_EXPORT size_t qHash(const QContactCollection &key);
diff --git a/src/organizer/qorganizercollection.cpp b/src/organizer/qorganizercollection.cpp
index 96d8605e..1c5d3c25 100644
--- a/src/organizer/qorganizercollection.cpp
+++ b/src/organizer/qorganizercollection.cpp
@@ -208,6 +208,14 @@ QVariant QOrganizerCollection::extendedMetaData(const QString &key) const
return d->m_metaData.value(QOrganizerCollection::KeyExtended).toMap().value(key);
}
+/*!
+ Returns all extended metadata of the collection.
+ */
+QVariantMap QOrganizerCollection::extendedMetaData() const
+{
+ return d->m_metaData.value(QOrganizerCollection::KeyExtended).toMap();
+}
+
/*!
Returns the meta data of the collection for the given \a key.
*/
diff --git a/src/organizer/qorganizercollection.h b/src/organizer/qorganizercollection.h
index b9a077de..5d2ef774 100644
--- a/src/organizer/qorganizercollection.h
+++ b/src/organizer/qorganizercollection.h
@@ -86,6 +86,7 @@ public:
void setExtendedMetaData(const QString &key, const QVariant &value);
QVariant extendedMetaData(const QString &key) const;
+ QVariantMap extendedMetaData() const;
private:
friend Q_ORGANIZER_EXPORT size_t qHash(const QOrganizerCollection &key);
diff --git a/tests/auto/contacts/qcontactcollection/tst_qcontactcollection.cpp b/tests/auto/contacts/qcontactcollection/tst_qcontactcollection.cpp
index 5256196f..626c83f4 100644
--- a/tests/auto/contacts/qcontactcollection/tst_qcontactcollection.cpp
+++ b/tests/auto/contacts/qcontactcollection/tst_qcontactcollection.cpp
@@ -75,6 +75,8 @@ void tst_QContactCollection::metaData()
QVERIFY(c.metaData().isEmpty());
c.setExtendedMetaData(QString(QStringLiteral("test")), 5);
QCOMPARE(c.extendedMetaData(QString(QStringLiteral("test"))).toInt(), 5);
+ QCOMPARE(c.extendedMetaData().keys(), QStringList() << QStringLiteral("test"));
+ QCOMPARE(c.extendedMetaData().value(QString(QStringLiteral("test"))), 5);
QMap<QContactCollection::MetaDataKey, QVariant> mdm;
mdm.insert(QContactCollection::KeyName, QString(QStringLiteral("test2")));
diff --git a/tests/auto/organizer/qorganizercollection/tst_qorganizercollection.cpp b/tests/auto/organizer/qorganizercollection/tst_qorganizercollection.cpp
index ad0cb660..2fe76886 100644
--- a/tests/auto/organizer/qorganizercollection/tst_qorganizercollection.cpp
+++ b/tests/auto/organizer/qorganizercollection/tst_qorganizercollection.cpp
@@ -77,6 +77,8 @@ void tst_QOrganizerCollection::metaData()
QVERIFY(c.metaData().isEmpty());
c.setExtendedMetaData(QString(QStringLiteral("test")), 5);
QCOMPARE(c.extendedMetaData(QString(QStringLiteral("test"))).toInt(), 5);
+ QCOMPARE(c.extendedMetaData().keys(), QStringList() << QStringLiteral("test"));
+ QCOMPARE(c.extendedMetaData().value(QString(QStringLiteral("test"))), 5);
QMap<QOrganizerCollection::MetaDataKey, QVariant> mdm;
mdm.insert(QOrganizerCollection::KeyName, QString(QStringLiteral("test2")));
--
2.30.2
|
