2 commits - kolabformat/xmlobject.cpp

[Christian Mollekopf]

 kolabformat/xmlobject.cpp |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 2897ef96afc2ef45da4fbf2f27c9975c76f758af
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Thu Nov 8 17:16:20 2012 +0100

    Pass in the productId and not a boolean.

diff --git a/kolabformat/xmlobject.cpp b/kolabformat/xmlobject.cpp
index edd48cc..bead9f2 100644
--- a/kolabformat/xmlobject.cpp
+++ b/kolabformat/xmlobject.cpp
@@ -92,7 +92,7 @@ std::string XMLObject::writeTodo(const Todo &event, Version version, const std::
         const QString &xml = KolabV2::Task::taskToXML(i, QLatin1String("UTC"));
         return Conversion::toStdString(xml);
     }
-    const std::string result = Kolab::writeTodo(event, false);
+    const std::string result = Kolab::writeTodo(event, productId);
     mWrittenUID = Kolab::getSerializedUID();
     return result;
 }
@@ -124,7 +124,7 @@ std::string XMLObject::writeJournal(const Journal &event, Version version, const
         const QString &xml = KolabV2::Journal::journalToXML(i, QLatin1String("UTC"));
         return Conversion::toStdString(xml);
     }
-    const std::string result = Kolab::writeJournal(event, false);
+    const std::string result = Kolab::writeJournal(event, productId);
     mWrittenUID = Kolab::getSerializedUID();
     return result;
 }


commit 751f121ffbf5876a87f1b402a7701b3f0f787eb6
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Thu Nov 8 17:16:04 2012 +0100

    Don't call createUuid() recursively

diff --git a/kolabformat/xmlobject.cpp b/kolabformat/xmlobject.cpp
index f6260f8..edd48cc 100644
--- a/kolabformat/xmlobject.cpp
+++ b/kolabformat/xmlobject.cpp
@@ -28,7 +28,7 @@ namespace Kolab {
 
 static QString createUuid()
 {
-    const QString uuid = createUuid();
+    const QString uuid = QUuid::createUuid().toString();
     return uuid.mid(1, uuid.size()-2);
 }