modified createItemEngineId and createCollectionEngineId to take as parameters the engine specific parameters

8 files changed, 26 insertions, 18 deletions

diff --git a/plugins/organizer/maemo5/qorganizermaemo5.cpp b/plugins/organizer/maemo5/qorganizermaemo5.cpp
index 198a825840..2ee90fdc17 100644
--- a/plugins/organizer/maemo5/qorganizermaemo5.cpp
+++ b/plugins/organizer/maemo5/qorganizermaemo5.cpp
@@ -251,13 +251,15 @@ QOrganizerManagerEngine* QOrganizerItemMaemo5Factory::engine(const QMap<QString,
     return retn;
 }
 
-QOrganizerItemEngineId* QOrganizerItemMaemo5Factory::createItemEngineLocalId() const
+QOrganizerItemEngineId* QOrganizerItemMaemo5Factory::createItemEngineId(const QMap<QString, QString>& parameters) const
 {
+    Q_UNUSED(parameters);
     return new QOrganizerItemMaemo5EngineId;
 }
 
-QOrganizerCollectionEngineId* QOrganizerItemMaemo5Factory::createCollectionEngineLocalId() const
+QOrganizerCollectionEngineId* QOrganizerItemMaemo5Factory::createCollectionEngineId(const QMap<QString, QString>& parameters) const
 {
+    Q_UNUSED(parameters);
     return new QOrganizerCollectionMaemo5EngineId;
 }
 
diff --git a/plugins/organizer/maemo5/qorganizermaemo5_p.h b/plugins/organizer/maemo5/qorganizermaemo5_p.h
index 0843d2f56d..ceb263cae0 100644
--- a/plugins/organizer/maemo5/qorganizermaemo5_p.h
+++ b/plugins/organizer/maemo5/qorganizermaemo5_p.h
@@ -96,8 +96,8 @@ class QOrganizerItemMaemo5Factory : public QObject, public QOrganizerManagerEngi
   Q_INTERFACES(QtMobility::QOrganizerManagerEngineFactory)
   public:
     QOrganizerManagerEngine* engine(const QMap<QString, QString>& parameters, QOrganizerManager::Error*);
-    QOrganizerItemEngineId* createItemEngineLocalId() const;
-    QOrganizerCollectionEngineId* createCollectionEngineLocalId() const;
+    QOrganizerItemEngineId* createItemEngineId(const QMap<QString, QString>& parameters) const;
+    QOrganizerCollectionEngineId* createCollectionEngineId(const QMap<QString, QString>& parameters) const;
     QString managerName() const;
 };
 
diff --git a/plugins/organizer/skeleton/qorganizerskeleton.cpp b/plugins/organizer/skeleton/qorganizerskeleton.cpp
index dc59f5aba1..265ce7d49d 100644
--- a/plugins/organizer/skeleton/qorganizerskeleton.cpp
+++ b/plugins/organizer/skeleton/qorganizerskeleton.cpp
@@ -55,14 +55,16 @@ QOrganizerManagerEngine* QOrganizerItemSkeletonFactory::engine(const QMap<QStrin
     return ret;
 }
 
-QOrganizerItemEngineId* QOrganizerItemSkeletonFactory::createItemEngineLocalId() const
+QOrganizerItemEngineId* QOrganizerItemSkeletonFactory::createItemEngineId(const QMap<QString, QString>& parameters) const
 {
+    Q_UNUSED(parameters);
     /* TODO - instantiate your engine-specific item id in this function */
     return new QOrganizerItemSkeletonEngineLocalId;
 }
 
-QOrganizerCollectionEngineId* QOrganizerItemSkeletonFactory::createCollectionEngineLocalId() const
+QOrganizerCollectionEngineId* QOrganizerItemSkeletonFactory::createCollectionEngineId(const QMap<QString, QString>& parameters) const
 {
+    Q_UNUSED(parameters);
     /* TODO - instantiate your engine-specific collection id in this function */
     return new QOrganizerCollectionSkeletonEngineLocalId;
 }
diff --git a/plugins/organizer/skeleton/qorganizerskeleton_p.h b/plugins/organizer/skeleton/qorganizerskeleton_p.h
index 1e21b61e28..efddc7fb2f 100644
--- a/plugins/organizer/skeleton/qorganizerskeleton_p.h
+++ b/plugins/organizer/skeleton/qorganizerskeleton_p.h
@@ -82,8 +82,8 @@ class QOrganizerItemSkeletonFactory : public QObject, public QOrganizerManagerEn
   Q_INTERFACES(QtMobility::QOrganizerManagerEngineFactory)
   public:
     QOrganizerManagerEngine* engine(const QMap<QString, QString>& parameters, QOrganizerManager::Error*);
-    QOrganizerItemEngineId* createItemEngineLocalId() const;
-    QOrganizerCollectionEngineId* createCollectionEngineLocalId() const;
+    QOrganizerItemEngineId* createItemEngineId(const QMap<QString, QString>& parameters) const;
+    QOrganizerCollectionEngineId* createCollectionEngineId(const QMap<QString, QString>& parameters) const;
     QString managerName() const;
 };
 
diff --git a/plugins/organizer/symbian/qorganizersymbian.cpp b/plugins/organizer/symbian/qorganizersymbian.cpp
index cfa45fcf3f..c93c505711 100644
--- a/plugins/organizer/symbian/qorganizersymbian.cpp
+++ b/plugins/organizer/symbian/qorganizersymbian.cpp
@@ -271,13 +271,15 @@ QOrganizerManagerEngine* QOrganizerItemSymbianFactory::engine(
     return ret;
 }
 
-QOrganizerItemEngineId* QOrganizerItemSymbianFactory::createItemEngineLocalId() const
+QOrganizerItemEngineId* QOrganizerItemSymbianFactory::createItemEngineId(const QMap<QString, QString>& parameters) const
 {
+    Q_UNUSED(parameters);
     return new QOrganizerItemSymbianEngineLocalId;
 }
 
-QOrganizerCollectionEngineId* QOrganizerItemSymbianFactory::createCollectionEngineLocalId() const
+QOrganizerCollectionEngineId* QOrganizerItemSymbianFactory::createCollectionEngineId(const QMap<QString, QString>& parameters) const
 {
+    Q_UNUSED(parameters);
     return new QOrganizerCollectionSymbianEngineLocalId;
 }
 
diff --git a/plugins/organizer/symbian/qorganizersymbian_p.h b/plugins/organizer/symbian/qorganizersymbian_p.h
index 079677c667..cb0b3f7802 100644
--- a/plugins/organizer/symbian/qorganizersymbian_p.h
+++ b/plugins/organizer/symbian/qorganizersymbian_p.h
@@ -168,8 +168,8 @@ public QOrganizerManagerEngineFactory
         const QMap<QString, QString>& parameters, 
         QOrganizerManager::Error*);
     QString managerName() const;
-    QOrganizerItemEngineId* createItemEngineLocalId() const;
-    QOrganizerCollectionEngineId* createCollectionEngineLocalId() const;
+    QOrganizerItemEngineId* createItemEngineId(const QMap<QString, QString>& parameters) const;
+    QOrganizerCollectionEngineId* createCollectionEngineId(const QMap<QString, QString>& parameters) const;
 };
 
 class QOrganizerItemSymbianEngineData : public QSharedData
diff --git a/src/organizer/qorganizermanager_p.cpp b/src/organizer/qorganizermanager_p.cpp
index 4225c0745a..1d223913ca 100644
--- a/src/organizer/qorganizermanager_p.cpp
+++ b/src/organizer/qorganizermanager_p.cpp
@@ -262,28 +262,30 @@ void QOrganizerManagerData::loadFactories()
 QOrganizerItemEngineId* QOrganizerManagerData::createEngineItemId(const QString& uri)
 {
     QString managerName;
-    QOrganizerManager::parseUri(uri, &managerName, NULL);
+    QMap<QString, QString> parameters;
+    QOrganizerManager::parseUri(uri, &managerName, &parameters);
 
     if (managerName == QLatin1String("memory"))
         return new QOrganizerItemMemoryEngineLocalId();
 
     loadFactories();
     QOrganizerManagerEngineFactory *engineFactory = m_engines.value(managerName);
-    return engineFactory ? engineFactory->createItemEngineLocalId() : NULL;
+    return engineFactory ? engineFactory->createItemEngineId(parameters) : NULL;
 }
 
 /* Caller takes ownership of the id */
 QOrganizerCollectionEngineId* QOrganizerManagerData::createEngineCollectionId(const QString& uri)
 {
     QString managerName;
-    QOrganizerManager::parseUri(uri, &managerName, NULL);
+    QMap<QString, QString> parameters;
+    QOrganizerManager::parseUri(uri, &managerName, &parameters);
 
     if (managerName == QLatin1String("memory"))
         return new QOrganizerCollectionMemoryEngineLocalId();
 
     loadFactories();
     QOrganizerManagerEngineFactory *engineFactory = m_engines.value(managerName);
-    return engineFactory ? engineFactory->createCollectionEngineLocalId() : NULL;
+    return engineFactory ? engineFactory->createCollectionEngineId(parameters) : NULL;
 }
 
 // trampoline for private classes
diff --git a/src/organizer/qorganizermanagerenginefactory.h b/src/organizer/qorganizermanagerenginefactory.h
index af0c532e58..62723e3547 100644
--- a/src/organizer/qorganizermanagerenginefactory.h
+++ b/src/organizer/qorganizermanagerenginefactory.h
@@ -61,8 +61,8 @@ public:
     virtual ~QOrganizerManagerEngineFactory();
     virtual QOrganizerManagerEngine* engine(const QMap<QString, QString>& parameters, QOrganizerManager::Error* error) = 0;
     virtual QString managerName() const = 0;
-    virtual QOrganizerItemEngineId* createItemEngineLocalId() const = 0;
-    virtual QOrganizerCollectionEngineId* createCollectionEngineLocalId()const  = 0;
+    virtual QOrganizerItemEngineId* createItemEngineId(const QMap<QString, QString>& parameters) const = 0;
+    virtual QOrganizerCollectionEngineId* createCollectionEngineId(const QMap<QString, QString>& parameters) const  = 0;
 };
 QTM_END_NAMESPACE