summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Mollekopf <mollekopf@kolabsys.com>2015-05-10 14:47:40 +0200
committerChristian Mollekopf <mollekopf@kolabsys.com>2015-05-10 14:47:40 +0200
commit3574e11321cc3906041969d08649f1a50644de16 (patch)
tree1e6b07f3a18f08c3ed162cf966acb330e40eb6bc
parenta8c3604ab188a6d65d01129580b9e0330eea0cf6 (diff)
downloadlibkolab-3574e11321cc3906041969d08649f1a50644de16.tar.gz
Cleanup
-rw-r--r--conversion/kcalconversion.cpp2
-rw-r--r--kolabformat/mimeobject.cpp2
-rw-r--r--kolabformat/mimeobject.h1
-rw-r--r--tests/testhelpers.h2
4 files changed, 3 insertions, 4 deletions
diff --git a/conversion/kcalconversion.cpp b/conversion/kcalconversion.cpp
index 49ad40f..1ac8748 100644
--- a/conversion/kcalconversion.cpp
+++ b/conversion/kcalconversion.cpp
@@ -315,10 +315,8 @@ void setIncidence(KCalCore::Incidence &i, const T &e)
foreach (const Kolab::Attachment a, e.attachments()) {
KCalCore::Attachment::Ptr ptr;
if (!a.uri().empty()) {
- qDebug() << "with uri";
ptr = KCalCore::Attachment::Ptr(new KCalCore::Attachment(fromStdString(a.uri()), fromStdString(a.mimetype())));
} else {
- qDebug() << "with data " << a.data();
ptr = KCalCore::Attachment::Ptr(new KCalCore::Attachment(QByteArray::fromRawData(a.data().c_str(), a.data().size()).toBase64(), fromStdString(a.mimetype())));
}
if (!a.label().empty()) {
diff --git a/kolabformat/mimeobject.cpp b/kolabformat/mimeobject.cpp
index a4403ef..d5b21e1 100644
--- a/kolabformat/mimeobject.cpp
+++ b/kolabformat/mimeobject.cpp
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2012 Sofia Balicka <balicka@kolabsys.com>
+ * Copyright (C) 2014 Christian Mollekopf <mollekopf@kolabsys.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -351,7 +352,6 @@ QVariant MIMEObject::Private::readKolabV3(const KMime::Message::Ptr &msg, Kolab:
break;
}
- ErrorHandler::handleLibkolabxmlErrors();
if (ErrorHandler::errorOccured()) {
printMessageDebugInfo(msg);
return QVariant();
diff --git a/kolabformat/mimeobject.h b/kolabformat/mimeobject.h
index b6c6eb0..d6a5726 100644
--- a/kolabformat/mimeobject.h
+++ b/kolabformat/mimeobject.h
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2012 Sofia Balicka <balicka@kolabsys.com>
+ * Copyright (C) 2014 Christian Mollekopf <mollekopf@kolabsys.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
diff --git a/tests/testhelpers.h b/tests/testhelpers.h
index b0c00b7..f050ef3 100644
--- a/tests/testhelpers.h
+++ b/tests/testhelpers.h
@@ -133,7 +133,7 @@ namespace QTest {
template<>
char *toString(const KCalCore::Recurrence &at)
{
- at.dump();
+ // at.dump();
KCalCore::RecurrenceRule *r = at.defaultRRule();
QByteArray ba;
if (!r) {