summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSandro Knauß <mail@sandroknauss.de>2015-02-19 12:33:30 (GMT)
committerSandro Knauß <mail@sandroknauss.de>2015-02-19 13:11:10 (GMT)
commit3e76a96cf5e2273163ea7e3934177574c1fa0b81 (patch)
tree9fddcbc420fd890d063dbd8f8c08623d3f59f6b0
parent5c549ff13cb20de2482747decb789a2cd4761ec3 (diff)
downloadlibcalendaring-3e76a96cf5e2273163ea7e3934177574c1fa0b81.tar.gz
Adaptation for libcalendaring from import
-rw-r--r--kcalcore/calendar.cpp3
-rw-r--r--kcalcore/duration.cpp2
-rw-r--r--kcalcore/icalformat_p.cpp4
-rw-r--r--kcalcore/icalformat_p.h2
-rw-r--r--kcalcore/incidence.cpp6
-rw-r--r--kcalcore/incidencebase.cpp4
-rw-r--r--kcalcore/kcalcore_export.h6
-rw-r--r--kcalcore/memorycalendar.cpp4
-rw-r--r--kcalcore/recurrence.cpp2
-rw-r--r--kcalcore/recurrencerule.cpp2
10 files changed, 21 insertions, 14 deletions
diff --git a/kcalcore/calendar.cpp b/kcalcore/calendar.cpp
index 6c521c9..9f8c30f 100644
--- a/kcalcore/calendar.cpp
+++ b/kcalcore/calendar.cpp
@@ -40,7 +40,7 @@
#include "sorting.h"
#include "visitor.h"
-#include <KDebug>
+#include <kdebug.h>
extern "C" {
#include <icaltimezone.h>
@@ -1547,3 +1547,4 @@ void Calendar::virtual_hook(int id, void *data)
Q_ASSERT(false);
}
+#include "calendar.moc"
diff --git a/kcalcore/duration.cpp b/kcalcore/duration.cpp
index 0267db9..6b75d01 100644
--- a/kcalcore/duration.cpp
+++ b/kcalcore/duration.cpp
@@ -31,7 +31,7 @@
@author David Jarvie \<software@astrojar.org.uk\>
*/
#include "duration.h"
-#include <KDateTime>
+#include <kdatetime.h>
#include <QTime>
diff --git a/kcalcore/icalformat_p.cpp b/kcalcore/icalformat_p.cpp
index 03ea0ad..83401a8 100644
--- a/kcalcore/icalformat_p.cpp
+++ b/kcalcore/icalformat_p.cpp
@@ -47,8 +47,8 @@
#include "todo.h"
#include "visitor.h"
-#include <KCodecs>
-#include <KDebug>
+#include <kcodecs.h>
+#include <kdebug.h>
#include <QtCore/QFile>
diff --git a/kcalcore/icalformat_p.h b/kcalcore/icalformat_p.h
index dfb5047..9995dab 100644
--- a/kcalcore/icalformat_p.h
+++ b/kcalcore/icalformat_p.h
@@ -42,7 +42,7 @@
#include "calendar.h"
#include "schedulemessage.h"
-#include <KDateTime>
+#include <kdatetime.h>
#include <libical/ical.h>
diff --git a/kcalcore/incidence.cpp b/kcalcore/incidence.cpp
index 7abe2a4..4fbcb3d 100644
--- a/kcalcore/incidence.cpp
+++ b/kcalcore/incidence.cpp
@@ -35,9 +35,9 @@
#include "incidence.h"
#include "calformat.h"
-#include <KMimeType>
-#include <KTemporaryFile>
-#include <KDebug>
+#include <kmimetype.h>
+#include <ktemporaryfile.h>
+#include <kdebug.h>
#include <QTextDocument> // for Qt::escape() and Qt::mightBeRichText()
#include <QStringList>
diff --git a/kcalcore/incidencebase.cpp b/kcalcore/incidencebase.cpp
index baca4c7..2d1a71d 100644
--- a/kcalcore/incidencebase.cpp
+++ b/kcalcore/incidencebase.cpp
@@ -39,8 +39,8 @@
#include "visitor.h"
#include <QTime>
-#include <KDebug>
-#include <KUrl>
+#include <kdebug.h>
+#include <kurl.h>
#include <QtCore/QStringList>
diff --git a/kcalcore/kcalcore_export.h b/kcalcore/kcalcore_export.h
index 364c818..d515b2a 100644
--- a/kcalcore/kcalcore_export.h
+++ b/kcalcore/kcalcore_export.h
@@ -21,6 +21,8 @@
#ifndef KCALCORE_EXPORT_H
#define KCALCORE_EXPORT_H
+#define LIBCALENDARING_DURATION_DECLARED
+
#include <kdemacros.h>
#ifndef KCALCORE_EXPORT
@@ -36,6 +38,10 @@
# endif
#endif
+# ifndef KCALCORE_DEPRECATED
+# define KCALCORE_DEPRECATED __attribute__ ((__deprecated__))
+# endif
+
# ifndef KCALCORE_EXPORT_DEPRECATED
# if !defined( WANT_DEPRECATED_KCALCORE_API )
# define KCALCORE_EXPORT_DEPRECATED KDE_DEPRECATED KCALCORE_EXPORT
diff --git a/kcalcore/memorycalendar.cpp b/kcalcore/memorycalendar.cpp
index 71f669f..33cc0e7 100644
--- a/kcalcore/memorycalendar.cpp
+++ b/kcalcore/memorycalendar.cpp
@@ -34,10 +34,10 @@
#include "memorycalendar.h"
-#include <KDebug>
+#include <kdebug.h>
#include <QDate>
#include <QDataStream>
-#include <KDateTime>
+#include <kdatetime.h>
using namespace KCalCore;
diff --git a/kcalcore/recurrence.cpp b/kcalcore/recurrence.cpp
index a1ad460..6ae1578 100644
--- a/kcalcore/recurrence.cpp
+++ b/kcalcore/recurrence.cpp
@@ -23,7 +23,7 @@
*/
#include "recurrence.h"
-#include <KDebug>
+#include <kdebug.h>
#include <QtCore/QBitArray>
#include <QtCore/QTime>
diff --git a/kcalcore/recurrencerule.cpp b/kcalcore/recurrencerule.cpp
index 40f63c1..2b17c7d 100644
--- a/kcalcore/recurrencerule.cpp
+++ b/kcalcore/recurrencerule.cpp
@@ -21,7 +21,7 @@
*/
#include "recurrencerule.h"
-#include <KDebug>
+#include <kdebug.h>
#include <QtCore/QStringList>
#include <QtCore/QTime>