Replace defaultCollection() with defaultCollectionId()

This assumes the id of a default collection is known at the engine
initialization time, but makes it possible to defer fetching
the default collection's content up until it is needed.
This also greatly simplifies the initialization process for the
async-only engines.

Change-Id: I5116ffdd22d7fa6cc5f8a8eed7f94518e6db7089
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/src/imports/organizer/qdeclarativeorganizermodel.cpp b/src/imports/organizer/qdeclarativeorganizermodel.cpp
index fb0ef7081..8432ffa2a 100644
--- a/src/imports/organizer/qdeclarativeorganizermodel.cpp
+++ b/src/imports/organizer/qdeclarativeorganizermodel.cpp
@@ -1696,13 +1696,13 @@ void QDeclarativeOrganizerModel::removeCollection(const QString &collectionId)
 }
 
 /*!
-  \qmlmethod Collection OrganizerModel::defaultCollection()
-  Returns the default Collection object.
+  \qmlmethod string OrganizerModel::defaultCollectionId()
+  Returns the id of a default Collection object.
   */
-QDeclarativeOrganizerCollection* QDeclarativeOrganizerModel::defaultCollection()
+QString QDeclarativeOrganizerModel::defaultCollectionId() const
 {
-    Q_D(QDeclarativeOrganizerModel);
-    return collection(d->m_manager->defaultCollection().id().toString());
+    Q_D(const QDeclarativeOrganizerModel);
+    return d->m_manager->defaultCollectionId().toString();
 }
 
 /*!