Branch 'libkolab-0.5' - 3 commits - calendaring/datetimeutils.cpp kolabformat/kolabdefinitions.h kolabformat/kolabobject.cpp kolabformat/kolabobject.h kolabformat/v2helpers.cpp

[Christian Mollekopf]

 calendaring/datetimeutils.cpp  |    2 +-
 kolabformat/kolabdefinitions.h |    4 ++--
 kolabformat/kolabobject.cpp    |    2 +-
 kolabformat/kolabobject.h      |    2 +-
 kolabformat/v2helpers.cpp      |    4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit ef9e812aae74f962070d5926ca0687960e084d50
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Mon Jun 23 12:50:39 2014 +0200

    Fixed another header warning.
    
    Patch by Laurent Montel.

diff --git a/calendaring/datetimeutils.cpp b/calendaring/datetimeutils.cpp
index 73f730d..d6ea077 100644
--- a/calendaring/datetimeutils.cpp
+++ b/calendaring/datetimeutils.cpp
@@ -17,7 +17,7 @@
 
 #include "datetimeutils.h"
 
-#include <Qt/qdebug.h>
+#include <qdebug.h>
 #include <ksystemtimezone.h>
 #include "conversion/commonconversion.h"
 


commit dd5a02daa84ce30a50350e7bc7121cbe9d38a840
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Mon Jun 23 12:52:27 2014 +0200

    Fixed a warning.
    
    Thanks Laurent.

diff --git a/kolabformat/kolabobject.h b/kolabformat/kolabobject.h
index 23836e6..1b39ad6 100644
--- a/kolabformat/kolabobject.h
+++ b/kolabformat/kolabobject.h
@@ -114,6 +114,6 @@ public:
     
 };
 
-}; //Namespace
+} //Namespace
 
 #endif // KOLABOBJECT_H


commit 8d87fba98a89b0ab8d5a0019688d2363c3e4de62
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Mon Jun 23 12:52:12 2014 +0200

    Use the correct X-Kolab-Type according to KEP:17

diff --git a/kolabformat/kolabdefinitions.h b/kolabformat/kolabdefinitions.h
index 6bde0c2..379648c 100644
--- a/kolabformat/kolabdefinitions.h
+++ b/kolabformat/kolabdefinitions.h
@@ -56,8 +56,8 @@ namespace Kolab {
 #define KOLAB_TYPE_TASK    "application/x-vnd.kolab.task"
 #define KOLAB_TYPE_JOURNAL    "application/x-vnd.kolab.journal"
 #define KOLAB_TYPE_CONTACT    "application/x-vnd.kolab.contact"
-#define KOLAB_TYPE_DISTLIST    "application/x-vnd.kolab.contact.distlist"
-#define KOLAB_TYPE_DISTLIST_COMPAT  "application/x-vnd.kolab.distribution-list"
+#define KOLAB_TYPE_DISTLIST_V2    "application/x-vnd.kolab.contact.distlist"
+#define KOLAB_TYPE_DISTLIST  "application/x-vnd.kolab.distribution-list"
 #define KOLAB_TYPE_NOTE   "application/x-vnd.kolab.note"
 #define KOLAB_TYPE_CONFIGURATION    "application/x-vnd.kolab.configuration"
 #define KOLAB_TYPE_DICT    "application/x-vnd.kolab.configuration.dictionary"
diff --git a/kolabformat/kolabobject.cpp b/kolabformat/kolabobject.cpp
index 0619e3f..8b32d9b 100644
--- a/kolabformat/kolabobject.cpp
+++ b/kolabformat/kolabobject.cpp
@@ -46,7 +46,7 @@ static inline QString todoKolabType() { return QString::fromLatin1(KOLAB_TYPE_TA
 static inline QString journalKolabType() { return QString::fromLatin1(KOLAB_TYPE_JOURNAL); };
 static inline QString contactKolabType() { return QString::fromLatin1(KOLAB_TYPE_CONTACT); };
 static inline QString distlistKolabType() { return QString::fromLatin1(KOLAB_TYPE_DISTLIST); }
-static inline QString distlistKolabTypeCompat() { return QString::fromLatin1(KOLAB_TYPE_DISTLIST_COMPAT); }
+static inline QString distlistKolabTypeCompat() { return QString::fromLatin1(KOLAB_TYPE_DISTLIST_V2); }
 static inline QString noteKolabType() { return QString::fromLatin1(KOLAB_TYPE_NOTE); }
 static inline QString configurationKolabType() { return QString::fromLatin1(KOLAB_TYPE_CONFIGURATION); }
 static inline QString dictKolabType() { return QString::fromLatin1(KOLAB_TYPE_DICT); }
diff --git a/kolabformat/v2helpers.cpp b/kolabformat/v2helpers.cpp
index 0f891cc..03b4b19 100644
--- a/kolabformat/v2helpers.cpp
+++ b/kolabformat/v2helpers.cpp
@@ -192,7 +192,7 @@ KABC::ContactGroup contactGroupFromKolab(const QByteArray &xmlData)
 
 KMime::Message::Ptr distListToKolabFormat(const KolabV2::DistributionList& distList, const QString &productId)
 {    
-    KMime::Message::Ptr message = Mime::createMessage( KOLAB_TYPE_DISTLIST, false, productId );
+    KMime::Message::Ptr message = Mime::createMessage( KOLAB_TYPE_DISTLIST_V2, false, productId );
     if (!message) {
         Critical() << "empty message";
         return KMime::Message::Ptr();
@@ -200,7 +200,7 @@ KMime::Message::Ptr distListToKolabFormat(const KolabV2::DistributionList& distL
     message->subject()->fromUnicodeString( distList.uid(), "utf-8" );
     message->from()->fromUnicodeString( distList.uid(), "utf-8" );
     
-    KMime::Content* content = Mime::createMainPart( KOLAB_TYPE_DISTLIST, distList.saveXML().toUtf8() );
+    KMime::Content* content = Mime::createMainPart( KOLAB_TYPE_DISTLIST_V2, distList.saveXML().toUtf8() );
     message->addContent( content );
     
     message->assemble();