kolabformat/xmlobject.cpp

[Christian Mollekopf]

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

New commits:
commit 9e3acf4cc219e6e19ec9be97619d5da57fd60504
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Thu Nov 8 17:12:43 2012 +0100

    Don't use the braces in generated uid's.

diff --git a/kolabformat/xmlobject.cpp b/kolabformat/xmlobject.cpp
index 4b4b15f..f6260f8 100644
--- a/kolabformat/xmlobject.cpp
+++ b/kolabformat/xmlobject.cpp
@@ -26,6 +26,12 @@
 
 namespace Kolab {
 
+static QString createUuid()
+{
+    const QString uuid = createUuid();
+    return uuid.mid(1, uuid.size()-2);
+}
+
 XMLObject::XMLObject()
 {
 
@@ -47,7 +53,7 @@ std::string XMLObject::writeEvent(const Event &event, Version version, const std
     if (version == KolabV2) {
         const KCalCore::Event::Ptr i = Conversion::toKCalCore(event);
         if (i->uid().isEmpty()) {
-            i->setUid(QUuid::createUuid().toString());
+            i->setUid(createUuid());
         }
         mWrittenUID = Conversion::toStdString(i->uid().toUtf8().constData());
         //The timezone is used for created and last modified dates
@@ -79,7 +85,7 @@ std::string XMLObject::writeTodo(const Todo &event, Version version, const std::
     if (version == KolabV2) {
         const KCalCore::Todo::Ptr i = Conversion::toKCalCore(event);
         if (i->uid().isEmpty()) {
-            i->setUid(QUuid::createUuid().toString());
+            i->setUid(createUuid());
         }
         mWrittenUID = Conversion::toStdString(i->uid().toUtf8().constData());
         //The timezone is used for created and last modified dates
@@ -111,7 +117,7 @@ std::string XMLObject::writeJournal(const Journal &event, Version version, const
     if (version == KolabV2) {
         const KCalCore::Journal::Ptr i = Conversion::toKCalCore(event);
         if (i->uid().isEmpty()) {
-            i->setUid(QUuid::createUuid().toString());
+            i->setUid(createUuid());
         }
         mWrittenUID = Conversion::toStdString(i->uid().toUtf8().constData());
         //The timezone is used for created and last modified dates
@@ -196,7 +202,7 @@ std::string XMLObject::writeContact(const Contact &contact, Version version, con
         //FIXME attachment names are hardcoded for now
         KABC::Addressee addressee = Conversion::toKABC(contact);
         if (addressee.uid().isEmpty()) {
-            addressee.setUid(QUuid::createUuid().toString());
+            addressee.setUid(createUuid());
         }
         mWrittenUID = Conversion::toStdString(addressee.uid().toUtf8().constData());
         const KolabV2::Contact contact(&addressee);
@@ -224,7 +230,7 @@ std::string XMLObject::writeDistlist(const DistList &distlist, Version version,
     if (version == KolabV2) {
         KABC::ContactGroup contactGroup = Conversion::toKABC(distlist);
         if (contactGroup.id().isEmpty()) {
-            contactGroup.setId(QUuid::createUuid().toString());
+            contactGroup.setId(createUuid());
         }
         mWrittenUID = Conversion::toStdString(contactGroup.id().toUtf8().constData());
         const KolabV2::DistributionList d(&contactGroup);
@@ -251,7 +257,7 @@ std::string XMLObject::writeNote(const Note &note, Version version, const std::s
     if (version == KolabV2) {
         Note noteWithUID = note;
         if (noteWithUID.uid().empty()) {
-            noteWithUID.setUid(Conversion::toStdString(QUuid::createUuid().toString()));
+            noteWithUID.setUid(Conversion::toStdString(createUuid()));
         }
         mWrittenUID = noteWithUID.uid();
         const KMime::Message::Ptr n = Conversion::toNote(noteWithUID);