Fix maemo5 engine given minor API polish

3 files changed, 26 insertions, 40 deletions

diff --git a/plugins/organizer/maemo5/qorganizermaemo5.cpp b/plugins/organizer/maemo5/qorganizermaemo5.cpp
index 2ee90fdc17..64d35b7d49 100644
--- a/plugins/organizer/maemo5/qorganizermaemo5.cpp
+++ b/plugins/organizer/maemo5/qorganizermaemo5.cpp
@@ -129,6 +129,11 @@ QOrganizerItemEngineId* QOrganizerItemMaemo5EngineId::clone() const
     return myClone;
 }
 
+QString QOrganizerItemMaemo5EngineId::toString() const
+{
+    return QString::number(m_localItemId);
+}
+
 #ifndef QT_NO_DEBUG_STREAM
 QDebug& QOrganizerItemMaemo5EngineId::debugStreamOut(QDebug& dbg) const
 {
@@ -137,20 +142,6 @@ QDebug& QOrganizerItemMaemo5EngineId::debugStreamOut(QDebug& dbg) const
 }
 #endif
 
-#ifndef QT_NO_DATASTREAM
-QDataStream& QOrganizerItemMaemo5EngineId::dataStreamOut(QDataStream& out) const
-{
-    out << m_localItemId;
-    return out;
-}
-
-QDataStream& QOrganizerItemMaemo5EngineId::dataStreamIn(QDataStream& in)
-{
-    in >> m_localItemId;
-    return in;
-}
-#endif
-
 uint QOrganizerItemMaemo5EngineId::hash() const
 {
     // Note: doesn't need to be unique, since == ensures difference.
@@ -217,6 +208,11 @@ QOrganizerCollectionEngineId* QOrganizerCollectionMaemo5EngineId::clone() const
     return myClone;
 }
 
+QString QOrganizerCollectionMaemo5EngineId::toString() const
+{
+    return QString::number(m_localCollectionId);
+}
+
 #ifndef QT_NO_DEBUG_STREAM
 QDebug& QOrganizerCollectionMaemo5EngineId::debugStreamOut(QDebug& dbg) const
 {
@@ -225,18 +221,6 @@ QDebug& QOrganizerCollectionMaemo5EngineId::debugStreamOut(QDebug& dbg) const
 }
 #endif
 
-#ifndef QT_NO_DATASTREAM
-QDataStream& QOrganizerCollectionMaemo5EngineId::dataStreamOut(QDataStream& out) const
-{
-    return (out << m_localCollectionId);
-}
-
-QDataStream& QOrganizerCollectionMaemo5EngineId::dataStreamIn(QDataStream& in)
-{
-    return (in >> m_localCollectionId);
-}
-#endif
-
 uint QOrganizerCollectionMaemo5EngineId::hash() const
 {
     return QT_PREPEND_NAMESPACE(qHash)(m_localCollectionId);
@@ -251,16 +235,22 @@ QOrganizerManagerEngine* QOrganizerItemMaemo5Factory::engine(const QMap<QString,
     return retn;
 }
 
-QOrganizerItemEngineId* QOrganizerItemMaemo5Factory::createItemEngineId(const QMap<QString, QString>& parameters) const
+QOrganizerItemEngineId* QOrganizerItemMaemo5Factory::createItemEngineId(const QMap<QString, QString>& parameters, const QString& idString) const
 {
     Q_UNUSED(parameters);
-    return new QOrganizerItemMaemo5EngineId;
+    QOrganizerItemMaemo5EngineId* retn = new QOrganizerItemMaemo5EngineId;
+    if (!idString.isEmpty())
+        retn->m_localItemId = idString.toUInt();
+    return retn;
 }
 
-QOrganizerCollectionEngineId* QOrganizerItemMaemo5Factory::createCollectionEngineId(const QMap<QString, QString>& parameters) const
+QOrganizerCollectionEngineId* QOrganizerItemMaemo5Factory::createCollectionEngineId(const QMap<QString, QString>& parameters, const QString& idString) const
 {
     Q_UNUSED(parameters);
-    return new QOrganizerCollectionMaemo5EngineId;
+    QOrganizerCollectionMaemo5EngineId* retn = new QOrganizerCollectionMaemo5EngineId;
+    if (!idString.isEmpty())
+        retn->m_localCollectionId = idString.toUInt();
+    return retn;
 }
 
 QString QOrganizerItemMaemo5Factory::managerName() const
diff --git a/plugins/organizer/maemo5/qorganizermaemo5_p.h b/plugins/organizer/maemo5/qorganizermaemo5_p.h
index ceb263cae0..cd7336d5d5 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* createItemEngineId(const QMap<QString, QString>& parameters) const;
-    QOrganizerCollectionEngineId* createCollectionEngineId(const QMap<QString, QString>& parameters) const;
+    QOrganizerItemEngineId* createItemEngineId(const QMap<QString, QString>& parameters, const QString& idString) const;
+    QOrganizerCollectionEngineId* createCollectionEngineId(const QMap<QString, QString>& parameters, const QString& idString) const;
     QString managerName() const;
 };
 
diff --git a/plugins/organizer/maemo5/qorganizermaemo5ids_p.h b/plugins/organizer/maemo5/qorganizermaemo5ids_p.h
index b3656f90d4..ca83f45691 100644
--- a/plugins/organizer/maemo5/qorganizermaemo5ids_p.h
+++ b/plugins/organizer/maemo5/qorganizermaemo5ids_p.h
@@ -68,13 +68,11 @@ public:
     const QString managerUri() const;
     QOrganizerCollectionEngineId* clone() const;
 
+    QString toString() const;
+
 #ifndef QT_NO_DEBUG_STREAM
     QDebug& debugStreamOut(QDebug& dbg) const;
 #endif
-#ifndef QT_NO_DATASTREAM
-    QDataStream& dataStreamOut(QDataStream& out) const;
-    QDataStream& dataStreamIn(QDataStream& in);
-#endif
     uint hash() const;
 
 public:
@@ -97,13 +95,11 @@ public:
     const QString managerUri() const;
     QOrganizerItemEngineId* clone() const;
 
+    QString toString() const;
+
 #ifndef QT_NO_DEBUG_STREAM
     QDebug& debugStreamOut(QDebug& dbg) const;
 #endif
-#ifndef QT_NO_DATASTREAM
-    QDataStream& dataStreamOut(QDataStream& out) const;
-    QDataStream& dataStreamIn(QDataStream& in);
-#endif
     uint hash() const;
 
 public: