Use enumeration for collection metadata keys.

Change-Id: Iaabd624001e52e644bdaf9891d6c3f3667ab565c
Reviewed-by: Päivi Rajala <paivi.rajala@nokia.com>

3 files changed, 9 insertions, 45 deletions

diff --git a/examples/calendardemo/src/eventeditpage.cpp b/examples/calendardemo/src/eventeditpage.cpp
index 455566d68..440b6af00 100644
--- a/examples/calendardemo/src/eventeditpage.cpp
+++ b/examples/calendardemo/src/eventeditpage.cpp
@@ -232,27 +232,15 @@ void EventEditPage::eventChanged(QOrganizerManager *manager, const QOrganizerEve
     }
 
     // resolve metadata field that contains calendar name (if any)
-    QString calendarNameMetadataKey;
     m_collections = m_manager->collections();
-    if (!m_collections.isEmpty()) {
-        QOrganizerCollection firstCollection = m_collections[0];
-        QVariantMap metadata = firstCollection.metaData();
-        QList<QString> metaDataKeys = metadata.keys();
-        foreach(QString key, metaDataKeys) {
-            if (key.indexOf("name", 0, Qt::CaseInsensitive) != -1) {
-                calendarNameMetadataKey = key;
-                break;
-            }
-        }
-    }
     int index = 0;
     int eventCalendarIndex = -1;
     foreach(QOrganizerCollection collection, m_collections) {
         // We currently have no way of stringifying ids
         //QString visibleName = "Calendar id = " + QString::number(collection.id().localId());
-        QString visibleName = "Calendar " + QString::number(index);
-        if (!calendarNameMetadataKey.isNull())
-            visibleName = collection.metaData(calendarNameMetadataKey).toString();
+        QString visibleName = collection.metaData(QOrganizerCollection::KeyName).toString();
+        if (visibleName.isEmpty())
+            visibleName = "Calendar " + QString::number(index);
 
         m_calendarComboBox->addItem(visibleName);
         if (collection.id() == event.collectionId())
diff --git a/examples/calendardemo/src/journaleditpage.cpp b/examples/calendardemo/src/journaleditpage.cpp
index 498e893bd..ed1fd952d 100644
--- a/examples/calendardemo/src/journaleditpage.cpp
+++ b/examples/calendardemo/src/journaleditpage.cpp
@@ -141,27 +141,15 @@ void JournalEditPage::journalChanged(QOrganizerManager *manager, const QOrganize
     m_calendarComboBox->clear();
 
     // resolve metadata field that contains calendar name (if any)
-    QString calendarNameMetadataKey;
     m_collections = m_manager->collections();
-    if (!m_collections.isEmpty()) {
-        QOrganizerCollection firstCollection = m_collections[0];
-        QVariantMap metadata = firstCollection.metaData();
-        QList<QString> metaDataKeys = metadata.keys();
-        foreach(QString key, metaDataKeys) {
-            if (key.indexOf("name", 0, Qt::CaseInsensitive) != -1) {
-                calendarNameMetadataKey = key;
-                break;
-            }
-        }
-    }
     int index = 0;
     int journalCalendarIndex = -1;
     foreach(QOrganizerCollection collection, m_collections) {
         // We currently have no way of stringifying ids
         // QString visibleName = "Calendar id = " + QString::number(collection.id().localId());
-        QString visibleName = "Calendar " + QString::number(index);
-        if (!calendarNameMetadataKey.isNull())
-            visibleName = collection.metaData(calendarNameMetadataKey).toString();
+        QString visibleName = collection.metaData(QOrganizerCollection::KeyName).toString();
+        if (visibleName.isEmpty())
+            visibleName = "Calendar " + QString::number(index);
 
         m_calendarComboBox->addItem(visibleName);
         if (collection.id() == journal.collectionId())
diff --git a/examples/calendardemo/src/todoeditpage.cpp b/examples/calendardemo/src/todoeditpage.cpp
index 41dcde1fc..81dfaccad 100644
--- a/examples/calendardemo/src/todoeditpage.cpp
+++ b/examples/calendardemo/src/todoeditpage.cpp
@@ -179,27 +179,15 @@ void TodoEditPage::todoChanged(QOrganizerManager *manager, const QOrganizerTodo
     m_calendarComboBox->clear();
 
     // resolve metadata field that contains calendar name (if any)
-    QString calendarNameMetadataKey;
     m_collections = m_manager->collections();
-    if (!m_collections.isEmpty()) {
-        QOrganizerCollection firstCollection = m_collections[0];
-        QVariantMap metadata = firstCollection.metaData();
-        QList<QString> metaDataKeys = metadata.keys();
-        foreach(QString key, metaDataKeys) {
-            if (key.indexOf("name", 0, Qt::CaseInsensitive) != -1) {
-                calendarNameMetadataKey = key;
-                break;
-            }
-        }
-    }
     int counter = 0;
     int todoCalendarIndex = -1;
     foreach(QOrganizerCollection collection, m_collections) {
         // We currently have no way of stringifying ids
         // QString visibleName = "Calendar id = " + QString::number(collection.id().localId());
-        QString visibleName = "Calendar " + QString::number(counter);
-        if (!calendarNameMetadataKey.isNull())
-            visibleName = collection.metaData(calendarNameMetadataKey).toString();
+        QString visibleName = collection.metaData(QOrganizerCollection::KeyName).toString();
+        if (visibleName.isEmpty())
+            visibleName = "Calendar " + QString::number(index);
 
         m_calendarComboBox->addItem(visibleName);
         if (collection.id() == todo.collectionId())