3 commits - CMakeLists.txt conversion/kabcconversion.cpp kolabformat/mimeobject.h kolabformat/xmlobject.h tests/formattest.cpp

[Christian Mollekopf]

 CMakeLists.txt                |    4 +++-
 conversion/kabcconversion.cpp |    1 -
 kolabformat/mimeobject.h      |    2 +-
 kolabformat/xmlobject.h       |    2 +-
 tests/formattest.cpp          |   15 ---------------
 5 files changed, 5 insertions(+), 19 deletions(-)

New commits:
commit 77194425fdadfa886f309ada25058ae89a8bdfca
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Thu Jan 3 16:40:58 2013 +0100

    Bump minor to 0.5

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 48ac2ec..4ec1244 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,7 +31,7 @@ endif()
 # 0.1.1 (patch release for 0.1.0)
 # 0.2 (0.2 development version towards 0.2.0)
 set(Libkolab_VERSION_MAJOR 0)
-set(Libkolab_VERSION_MINOR 4)
+set(Libkolab_VERSION_MINOR 5)
 # Enable the full x.y.z version only for release versions
 #set(Libkolab_VERSION_PATCH 1)
 #set(Libkolab_VERSION ${Libkolab_VERSION_MAJOR}.${Libkolab_VERSION_MINOR}.${Libkolab_VERSION_PATCH} )


commit ae331b015d7a26a579ae5f2008e1b68a0937548e
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Thu Jan 3 16:39:15 2013 +0100

    install headers

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6b6210d..48ac2ec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -166,6 +166,8 @@ install(FILES
     kolabformat/formathelpers.h
     kolabformat/kolabobject.h
     kolabformat/errorhandler.h
+    kolabformat/xmlobject.h
+    kolabformat/mimeobject.h
     conversion/kcalconversion.h
     conversion/kabcconversion.h
     conversion/commonconversion.h


commit 5a1a227c2bd5b39ab37826422704d5f8672dcbff
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Thu Jan 3 16:35:31 2013 +0100

    cleanup

diff --git a/conversion/kabcconversion.cpp b/conversion/kabcconversion.cpp
index 1be0df8..6ab7185 100644
--- a/conversion/kabcconversion.cpp
+++ b/conversion/kabcconversion.cpp
@@ -834,7 +834,6 @@ KABC::ContactGroup toKABC(const DistList &dl)
     KABC::ContactGroup cg(fromStdString(dl.name()));
     cg.setId(fromStdString(dl.uid()));
     foreach(const Kolab::ContactReference &m, dl.members()) {
-        KABC::ContactGroup::Data data;
         switch (m.type()) {
             case Kolab::ContactReference::EmailReference:
                 cg.append(KABC::ContactGroup::Data(fromStdString(m.name()), fromStdString(m.email())));
diff --git a/kolabformat/mimeobject.h b/kolabformat/mimeobject.h
index e025947..89ff788 100644
--- a/kolabformat/mimeobject.h
+++ b/kolabformat/mimeobject.h
@@ -35,7 +35,7 @@ namespace Kolab
 class KOLAB_EXPORT MIMEObject
 {
 public:
-    explicit MIMEObject();
+    MIMEObject();
 
     std::string writeEvent(const Kolab::Event  &event, Version version, const std::string &productId = std::string());
     Kolab::Event readEvent(const std::string &s);
diff --git a/kolabformat/xmlobject.h b/kolabformat/xmlobject.h
index 6bb4149..6012095 100644
--- a/kolabformat/xmlobject.h
+++ b/kolabformat/xmlobject.h
@@ -34,7 +34,7 @@ namespace Kolab {
 class KOLAB_EXPORT XMLObject
 {
 public:
-    explicit XMLObject();
+    XMLObject();
 
     std::string getSerializedUID() const;
     
diff --git a/tests/formattest.cpp b/tests/formattest.cpp
index 5354920..3c05eb0 100644
--- a/tests/formattest.cpp
+++ b/tests/formattest.cpp
@@ -37,21 +37,6 @@
 #include "kolabformat/errorhandler.h"
 #include "kolabformat/kolabdefinitions.h"
 
-/*
-void normalizeMimemessage(QString &content)
-{
-    content.replace(QRegExp("\\bLibkolab-\\d.\\d.\\d\\b", Qt::CaseSensitive), "Libkolab-x.x.x");
-    content.replace(QRegExp("\\bLibkolabxml-\\d.\\d.\\d\\b", Qt::CaseSensitive), "Libkolabxml-x.x.x");
-    content.replace(QRegExp("\\bLibkolab-\\d.\\d\\b", Qt::CaseSensitive), "Libkolab-x.x.x");
-    content.replace(QRegExp("\\bLibkolabxml-\\d.\\d\\b", Qt::CaseSensitive), "Libkolabxml-x.x.x");
-    content.replace(QRegExp("<uri>cid:*@kolab.resource.akonadi</uri>", Qt::CaseSensitive, QRegExp::Wildcard), "<uri>cid:id at kolab.resource.akonadi</uri>");
-    content.replace(QRegExp("<last-modification-date>*</last-modification-date>", Qt::CaseSensitive, QRegExp::Wildcard), "<last-modification-date></last-modification-date>");
-
-    content.replace(QRegExp("--nextPart\\S*", Qt::CaseSensitive), "--part");
-    content.replace(QRegExp("\\bboundary=\"nextPart[^\\n]*", Qt::CaseSensitive), "boundary");
-    content.replace(QRegExp("Date[^\\n]*", Qt::CaseSensitive), "Date");
-}
-*/
 static bool compareMimeMessage( const KMime::Message::Ptr &msg, const KMime::Message::Ptr &expectedMsg )
 {
     // headers