diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -45,6 +45,9 @@ add_library(KF5::CalendarCore ALIAS KF5CalendarCore) +# backward compatibility with the old name +# TODO: remove for KF6 +target_compile_definitions(KF5CalendarCore INTERFACE "-DKCalCore=KCalendarCore") target_include_directories(KF5CalendarCore INTERFACE "$") target_include_directories(KF5CalendarCore PUBLIC "$") diff --git a/src/alarm.h b/src/alarm.h --- a/src/alarm.h +++ b/src/alarm.h @@ -46,7 +46,7 @@ class QTimeZone; -namespace KCalCore +namespace KCalendarCore { class Incidence; @@ -672,28 +672,28 @@ class Private; Private *const d; //@endcond - friend KCALCORE_EXPORT QDataStream &operator<<(QDataStream &s, const KCalCore::Alarm::Ptr &); - friend KCALCORE_EXPORT QDataStream &operator>>(QDataStream &s, const KCalCore::Alarm::Ptr &); + friend KCALCORE_EXPORT QDataStream &operator<<(QDataStream &s, const KCalendarCore::Alarm::Ptr &); + friend KCALCORE_EXPORT QDataStream &operator>>(QDataStream &s, const KCalendarCore::Alarm::Ptr &); }; /** * Alarm serializer. * * @since 4.12 */ -KCALCORE_EXPORT QDataStream &operator<<(QDataStream &out, const KCalCore::Alarm::Ptr &); +KCALCORE_EXPORT QDataStream &operator<<(QDataStream &out, const KCalendarCore::Alarm::Ptr &); /** * Alarm deserializer. * * @since 4.12 */ -KCALCORE_EXPORT QDataStream &operator>>(QDataStream &in, const KCalCore::Alarm::Ptr &); +KCALCORE_EXPORT QDataStream &operator>>(QDataStream &in, const KCalendarCore::Alarm::Ptr &); } //@cond PRIVATE -Q_DECLARE_TYPEINFO(KCalCore::Alarm::Ptr, Q_MOVABLE_TYPE); -Q_DECLARE_METATYPE(KCalCore::Alarm::Ptr) +Q_DECLARE_TYPEINFO(KCalendarCore::Alarm::Ptr, Q_MOVABLE_TYPE); +Q_DECLARE_METATYPE(KCalendarCore::Alarm::Ptr) //@endcond #endif diff --git a/src/alarm.cpp b/src/alarm.cpp --- a/src/alarm.cpp +++ b/src/alarm.cpp @@ -38,14 +38,14 @@ #include #include -using namespace KCalCore; +using namespace KCalendarCore; /** Private class that helps to provide binary compatibility between releases. @internal */ //@cond PRIVATE -class Q_DECL_HIDDEN KCalCore::Alarm::Private +class Q_DECL_HIDDEN KCalendarCore::Alarm::Private { public: Private() @@ -86,13 +86,13 @@ }; //@endcond -Alarm::Alarm(Incidence *parent) : d(new KCalCore::Alarm::Private) +Alarm::Alarm(Incidence *parent) : d(new KCalendarCore::Alarm::Private) { d->mParent = parent; } Alarm::Alarm(const Alarm &other) : - CustomProperties(other), d(new KCalCore::Alarm::Private(*other.d)) + CustomProperties(other), d(new KCalendarCore::Alarm::Private(*other.d)) { } @@ -835,7 +835,7 @@ return d->mLocationRadius; } -QDataStream &KCalCore::operator<<(QDataStream &out, const KCalCore::Alarm::Ptr &a) +QDataStream &KCalendarCore::operator<<(QDataStream &out, const KCalendarCore::Alarm::Ptr &a) { if (a) { out << ((quint32)a->d->mType) @@ -859,7 +859,7 @@ return out; } -QDataStream &KCalCore::operator>>(QDataStream &in, const KCalCore::Alarm::Ptr &a) +QDataStream &KCalendarCore::operator>>(QDataStream &in, const KCalendarCore::Alarm::Ptr &a) { if (a) { quint32 type; diff --git a/src/attachment.h b/src/attachment.h --- a/src/attachment.h +++ b/src/attachment.h @@ -36,7 +36,7 @@ #include #include -namespace KCalCore +namespace KCalendarCore { /** @@ -278,29 +278,29 @@ QSharedDataPointer d; //@endcond - friend KCALCORE_EXPORT QDataStream &operator<<(QDataStream &s, const KCalCore::Attachment&); - friend KCALCORE_EXPORT QDataStream &operator>>(QDataStream &s, KCalCore::Attachment&); + friend KCALCORE_EXPORT QDataStream &operator<<(QDataStream &s, const KCalendarCore::Attachment&); + friend KCALCORE_EXPORT QDataStream &operator>>(QDataStream &s, KCalendarCore::Attachment&); }; /** * Attachment serializer. * * @since 4.12 */ -KCALCORE_EXPORT QDataStream &operator<<(QDataStream &out, const KCalCore::Attachment&); +KCALCORE_EXPORT QDataStream &operator<<(QDataStream &out, const KCalendarCore::Attachment&); /** * Attachment deserializer. * * @since 4.12 */ -KCALCORE_EXPORT QDataStream &operator>>(QDataStream &in, KCalCore::Attachment&); +KCALCORE_EXPORT QDataStream &operator>>(QDataStream &in, KCalendarCore::Attachment&); } //@cond PRIVATE -Q_DECLARE_TYPEINFO(KCalCore::Attachment, Q_MOVABLE_TYPE); -Q_DECLARE_METATYPE(KCalCore::Attachment) +Q_DECLARE_TYPEINFO(KCalendarCore::Attachment, Q_MOVABLE_TYPE); +Q_DECLARE_METATYPE(KCalendarCore::Attachment) //@endcond #endif diff --git a/src/attachment.cpp b/src/attachment.cpp --- a/src/attachment.cpp +++ b/src/attachment.cpp @@ -32,14 +32,14 @@ #include "attachment.h" #include -using namespace KCalCore; +using namespace KCalendarCore; /** Private class that helps to provide binary compatibility between releases. @internal */ //@cond PRIVATE -class Q_DECL_HIDDEN KCalCore::Attachment::Private : public QSharedData +class Q_DECL_HIDDEN KCalendarCore::Attachment::Private : public QSharedData { public: Private() = default; @@ -219,7 +219,7 @@ return !(*this == a2); } -QDataStream &KCalCore::operator<<(QDataStream &out, const KCalCore::Attachment &a) +QDataStream &KCalendarCore::operator<<(QDataStream &out, const KCalendarCore::Attachment &a) { out << a.d->mSize << a.d->mMimeType @@ -232,7 +232,7 @@ return out; } -QDataStream &KCalCore::operator>>(QDataStream &in, KCalCore::Attachment &a) +QDataStream &KCalendarCore::operator>>(QDataStream &in, KCalendarCore::Attachment &a) { in >> a.d->mSize >> a.d->mMimeType diff --git a/src/attendee.h b/src/attendee.h --- a/src/attendee.h +++ b/src/attendee.h @@ -35,7 +35,7 @@ #include "kcalcore_export.h" #include "customproperties.h" -namespace KCalCore +namespace KCalendarCore { /** @@ -361,31 +361,31 @@ //@endcond friend KCALCORE_EXPORT QDataStream &operator<<(QDataStream &s, - const KCalCore::Attendee &attendee); + const KCalendarCore::Attendee &attendee); friend KCALCORE_EXPORT QDataStream &operator>>(QDataStream &s, - KCalCore::Attendee &attendee); + KCalendarCore::Attendee &attendee); }; /** Serializes an Attendee object into a data stream. @param stream is a QDataStream. @param attendee is a pointer to a Attendee object to be serialized. */ KCALCORE_EXPORT QDataStream &operator<<(QDataStream &stream, - const KCalCore::Attendee &attendee); + const KCalendarCore::Attendee &attendee); /** Initializes an Attendee object from a data stream. @param stream is a QDataStream. @param attendee is a pointer to a Attendee object to be initialized. */ KCALCORE_EXPORT QDataStream &operator>>(QDataStream &stream, - KCalCore::Attendee &attendee); + KCalendarCore::Attendee &attendee); } //@cond PRIVATE -Q_DECLARE_TYPEINFO(KCalCore::Attendee, Q_MOVABLE_TYPE); -Q_DECLARE_METATYPE(KCalCore::Attendee) +Q_DECLARE_TYPEINFO(KCalendarCore::Attendee, Q_MOVABLE_TYPE); +Q_DECLARE_METATYPE(KCalendarCore::Attendee) //@endcond #endif diff --git a/src/attendee.cpp b/src/attendee.cpp --- a/src/attendee.cpp +++ b/src/attendee.cpp @@ -37,14 +37,14 @@ #include -using namespace KCalCore; +using namespace KCalendarCore; /** Private class that helps to provide binary compatibility between releases. @internal */ //@cond PRIVATE -class Q_DECL_HIDDEN KCalCore::Attendee::Private : public QSharedData +class Q_DECL_HIDDEN KCalendarCore::Attendee::Private : public QSharedData { public: void setCuType(CuType cuType); @@ -67,13 +67,13 @@ }; //@endcond -void KCalCore::Attendee::Private::setCuType(Attendee::CuType cuType) +void KCalendarCore::Attendee::Private::setCuType(Attendee::CuType cuType) { mCuType = cuType; sCuType.clear(); } -void KCalCore::Attendee::Private::setCuType(const QString &cuType) +void KCalendarCore::Attendee::Private::setCuType(const QString &cuType) { const QString upper = cuType.toUpper(); if (upper == QLatin1String("INDIVIDUAL")) { @@ -92,12 +92,12 @@ } } -Attendee::CuType KCalCore::Attendee::Private::cuType() const +Attendee::CuType KCalendarCore::Attendee::Private::cuType() const { return mCuType; } -QString KCalCore::Attendee::Private::cuTypeStr() const +QString KCalendarCore::Attendee::Private::cuTypeStr() const { switch (mCuType) { case Attendee::Individual: @@ -149,7 +149,7 @@ return d->mName.isNull() && d->mEmail.isNull(); } -bool KCalCore::Attendee::operator==(const Attendee &attendee) const +bool KCalendarCore::Attendee::operator==(const Attendee &attendee) const { return d->mUid == attendee.d->mUid && @@ -163,12 +163,12 @@ d->mEmail == attendee.d->mEmail; } -bool KCalCore::Attendee::operator!=(const Attendee &attendee) const +bool KCalendarCore::Attendee::operator!=(const Attendee &attendee) const { return !operator==(attendee); } -Attendee &KCalCore::Attendee::operator=(const Attendee &attendee) +Attendee &KCalendarCore::Attendee::operator=(const Attendee &attendee) { // check for self assignment if (&attendee == this) { @@ -319,9 +319,9 @@ return d->mCustomProperties; } -QDataStream &KCalCore::operator<<(QDataStream &stream, const KCalCore::Attendee &attendee) +QDataStream &KCalendarCore::operator<<(QDataStream &stream, const KCalendarCore::Attendee &attendee) { - KCalCore::Person p(attendee.name(), attendee.email()); + KCalendarCore::Person p(attendee.name(), attendee.email()); stream << p; return stream << attendee.d->mRSVP << int(attendee.d->mRole) @@ -333,7 +333,7 @@ << attendee.d->mCustomProperties; } -QDataStream &KCalCore::operator>>(QDataStream &stream, KCalCore::Attendee &attendee) +QDataStream &KCalendarCore::operator>>(QDataStream &stream, KCalendarCore::Attendee &attendee) { bool RSVP; Attendee::Role role; @@ -346,7 +346,7 @@ uint role_int; uint status_int; - KCalCore::Person person; + KCalendarCore::Person person; stream >> person; stream >> RSVP >> role_int diff --git a/src/calendar.h b/src/calendar.h --- a/src/calendar.h +++ b/src/calendar.h @@ -59,8 +59,8 @@ #include #include -/** Namespace for all KCalCore types. */ -namespace KCalCore +/** Namespace for all KCalendarCore types. */ +namespace KCalendarCore { class CalFilter; @@ -134,7 +134,7 @@ { Q_OBJECT Q_PROPERTY(QString productId READ productId WRITE setProductId) //clazy:exclude=qproperty-without-notify - Q_PROPERTY(KCalCore::Person owner READ owner WRITE setOwner) + Q_PROPERTY(KCalendarCore::Person owner READ owner WRITE setOwner) public: diff --git a/src/calendar.cpp b/src/calendar.cpp --- a/src/calendar.cpp +++ b/src/calendar.cpp @@ -52,7 +52,7 @@ #include // for std::remove() -using namespace KCalCore; +using namespace KCalendarCore; /** Make a QHash::value that returns a QVector. @@ -140,13 +140,13 @@ //@endcond Calendar::Calendar(const QTimeZone &timeZone) - : d(new KCalCore::Calendar::Private) + : d(new KCalendarCore::Calendar::Private) { d->mTimeZone = timeZone; } Calendar::Calendar(const QByteArray &timeZoneId) - : d(new KCalCore::Calendar::Private) + : d(new KCalendarCore::Calendar::Private) { setTimeZoneId(timeZoneId); } diff --git a/src/calendar_p.h b/src/calendar_p.h --- a/src/calendar_p.h +++ b/src/calendar_p.h @@ -28,7 +28,7 @@ #include "calendar.h" #include "calfilter.h" -namespace KCalCore { +namespace KCalendarCore { /** Private class that helps to provide binary compatibility between releases. diff --git a/src/calfilter.h b/src/calfilter.h --- a/src/calfilter.h +++ b/src/calfilter.h @@ -36,7 +36,7 @@ #include "journal.h" #include "todo.h" -namespace KCalCore +namespace KCalendarCore { /** diff --git a/src/calfilter.cpp b/src/calfilter.cpp --- a/src/calfilter.cpp +++ b/src/calfilter.cpp @@ -35,14 +35,14 @@ #include "calfilter.h" -using namespace KCalCore; +using namespace KCalendarCore; /** Private class that helps to provide binary compatibility between releases. @internal */ //@cond PRIVATE -class Q_DECL_HIDDEN KCalCore::CalFilter::Private +class Q_DECL_HIDDEN KCalendarCore::CalFilter::Private { public: Private() @@ -57,12 +57,12 @@ }; //@endcond -CalFilter::CalFilter() : d(new KCalCore::CalFilter::Private) +CalFilter::CalFilter() : d(new KCalendarCore::CalFilter::Private) { } CalFilter::CalFilter(const QString &name) - : d(new KCalCore::CalFilter::Private) + : d(new KCalendarCore::CalFilter::Private) { d->mName = name; } @@ -72,7 +72,7 @@ delete d; } -bool KCalCore::CalFilter::operator==(const CalFilter &filter) const +bool KCalendarCore::CalFilter::operator==(const CalFilter &filter) const { return d->mName == filter.d->mName && d->mCriteria == filter.d->mCriteria && diff --git a/src/calformat.h b/src/calformat.h --- a/src/calformat.h +++ b/src/calformat.h @@ -34,7 +34,7 @@ #include -namespace KCalCore +namespace KCalendarCore { class Exception; diff --git a/src/calformat.cpp b/src/calformat.cpp --- a/src/calformat.cpp +++ b/src/calformat.cpp @@ -34,14 +34,14 @@ #include -using namespace KCalCore; +using namespace KCalendarCore; /** Private class that helps to provide binary compatibility between releases. @internal */ //@cond PRIVATE -class Q_DECL_HIDDEN KCalCore::CalFormat::Private +class Q_DECL_HIDDEN KCalendarCore::CalFormat::Private { public: Private() {} @@ -61,7 +61,7 @@ //@endcond CalFormat::CalFormat() - : d(new KCalCore::CalFormat::Private) + : d(new KCalendarCore::CalFormat::Private) { } diff --git a/src/calstorage.h b/src/calstorage.h --- a/src/calstorage.h +++ b/src/calstorage.h @@ -34,7 +34,7 @@ #include -namespace KCalCore +namespace KCalendarCore { /** diff --git a/src/calstorage.cpp b/src/calstorage.cpp --- a/src/calstorage.cpp +++ b/src/calstorage.cpp @@ -31,14 +31,14 @@ #include "calstorage.h" -using namespace KCalCore; +using namespace KCalendarCore; /** Private class that helps to provide binary compatibility between releases. @internal */ //@cond PRIVATE -class Q_DECL_HIDDEN KCalCore::CalStorage::Private +class Q_DECL_HIDDEN KCalendarCore::CalStorage::Private { public: Private(const Calendar::Ptr &cal) @@ -49,7 +49,7 @@ //@endcond CalStorage::CalStorage(const Calendar::Ptr &calendar) - : d(new KCalCore::CalStorage::Private(calendar)) + : d(new KCalendarCore::CalStorage::Private(calendar)) { } diff --git a/src/compat.cpp b/src/compat.cpp --- a/src/compat.cpp +++ b/src/compat.cpp @@ -42,7 +42,7 @@ #include #include -using namespace KCalCore; +using namespace KCalendarCore; Compat *CompatFactory::createCompat(const QString &productId, const QString &implementationVersion) diff --git a/src/compat_p.h b/src/compat_p.h --- a/src/compat_p.h +++ b/src/compat_p.h @@ -39,7 +39,7 @@ class QDate; class QString; -namespace KCalCore +namespace KCalendarCore { class Compat; diff --git a/src/customproperties.h b/src/customproperties.h --- a/src/customproperties.h +++ b/src/customproperties.h @@ -34,7 +34,7 @@ #include #include -namespace KCalCore +namespace KCalendarCore { /** @@ -52,9 +52,9 @@ class KCALCORE_EXPORT CustomProperties { friend KCALCORE_EXPORT QDataStream &operator<<(QDataStream &s, - const KCalCore::CustomProperties &properties); + const KCalendarCore::CustomProperties &properties); friend KCALCORE_EXPORT QDataStream &operator>>(QDataStream &s, - KCalCore::CustomProperties &properties); + KCalendarCore::CustomProperties &properties); public: /** Constructs an empty custom properties instance. @@ -208,13 +208,13 @@ Serializes the @p properties object into the @p stream. */ KCALCORE_EXPORT QDataStream &operator<<(QDataStream &stream, - const KCalCore::CustomProperties &properties); + const KCalendarCore::CustomProperties &properties); /** Initializes the @p properties object from the @p stream. */ KCALCORE_EXPORT QDataStream &operator>>(QDataStream &stream, - KCalCore::CustomProperties &properties); + KCalendarCore::CustomProperties &properties); } diff --git a/src/customproperties.cpp b/src/customproperties.cpp --- a/src/customproperties.cpp +++ b/src/customproperties.cpp @@ -34,7 +34,7 @@ #include #include "kcalcore_debug.h" -using namespace KCalCore; +using namespace KCalendarCore; //@cond PRIVATE static bool checkName(const QByteArray &name); @@ -252,15 +252,15 @@ } //@endcond -QDataStream &KCalCore::operator<<(QDataStream &stream, - const KCalCore::CustomProperties &properties) +QDataStream &KCalendarCore::operator<<(QDataStream &stream, + const KCalendarCore::CustomProperties &properties) { return stream << properties.d->mProperties << properties.d->mPropertyParameters; } -QDataStream &KCalCore::operator>>(QDataStream &stream, - KCalCore::CustomProperties &properties) +QDataStream &KCalendarCore::operator>>(QDataStream &stream, + KCalendarCore::CustomProperties &properties) { properties.d->mVolatileProperties.clear(); return stream >> properties.d->mProperties diff --git a/src/duration.h b/src/duration.h --- a/src/duration.h +++ b/src/duration.h @@ -39,7 +39,7 @@ class QDateTime; -namespace KCalCore +namespace KCalendarCore { /** @@ -323,31 +323,31 @@ Private *const d; //@endcond - friend KCALCORE_EXPORT QDataStream &operator<<(QDataStream &s, const KCalCore::Duration &); - friend KCALCORE_EXPORT QDataStream &operator>>(QDataStream &s, KCalCore::Duration &); + friend KCALCORE_EXPORT QDataStream &operator<<(QDataStream &s, const KCalendarCore::Duration &); + friend KCALCORE_EXPORT QDataStream &operator>>(QDataStream &s, KCalendarCore::Duration &); }; /** * Duration serializer. * * @since 4.12 */ -KCALCORE_EXPORT QDataStream &operator<<(QDataStream &out, const KCalCore::Duration &); +KCALCORE_EXPORT QDataStream &operator<<(QDataStream &out, const KCalendarCore::Duration &); /** * Duration deserializer. * * @since 4.12 */ -KCALCORE_EXPORT QDataStream &operator>>(QDataStream &in, KCalCore::Duration &); +KCALCORE_EXPORT QDataStream &operator>>(QDataStream &in, KCalendarCore::Duration &); inline uint qHash(const Duration &duration, uint seed = 0) { return qHash(qMakePair(duration.isDaily(), duration.asSeconds()), seed); } } -Q_DECLARE_METATYPE(KCalCore::Duration) +Q_DECLARE_METATYPE(KCalendarCore::Duration) #endif diff --git a/src/duration.cpp b/src/duration.cpp --- a/src/duration.cpp +++ b/src/duration.cpp @@ -35,14 +35,14 @@ #include #include -using namespace KCalCore; +using namespace KCalendarCore; /** Private class that helps to provide binary compatibility between releases. @internal */ //@cond PRIVATE -class Q_DECL_HIDDEN KCalCore::Duration::Private +class Q_DECL_HIDDEN KCalendarCore::Duration::Private { public: int seconds() const @@ -55,12 +55,12 @@ //@endcond Duration::Duration() - : d(new KCalCore::Duration::Private()) + : d(new KCalendarCore::Duration::Private()) { } Duration::Duration(const QDateTime &start, const QDateTime &end) - : d(new KCalCore::Duration::Private()) + : d(new KCalendarCore::Duration::Private()) { if (start.time() == end.time() && start.timeZone() == end.timeZone()) { d->mDuration = start.daysTo(end); @@ -72,7 +72,7 @@ } Duration::Duration(const QDateTime &start, const QDateTime &end, Type type) - : d(new KCalCore::Duration::Private()) + : d(new KCalendarCore::Duration::Private()) { if (type == Days) { QDateTime endSt(end.toTimeZone(start.timeZone())); @@ -97,14 +97,14 @@ } Duration::Duration(int duration, Type type) - : d(new KCalCore::Duration::Private()) + : d(new KCalendarCore::Duration::Private()) { d->mDuration = duration; d->mDaily = (type == Days); } Duration::Duration(const Duration &duration) - : d(new KCalCore::Duration::Private(*duration.d)) + : d(new KCalendarCore::Duration::Private(*duration.d)) { } @@ -218,13 +218,13 @@ return d->mDuration == 0; } -QDataStream &KCalCore::operator<<(QDataStream &out, const KCalCore::Duration &duration) +QDataStream &KCalendarCore::operator<<(QDataStream &out, const KCalendarCore::Duration &duration) { out << duration.d->mDuration << duration.d->mDaily; return out; } -QDataStream &KCalCore::operator>>(QDataStream &in, KCalCore::Duration &duration) +QDataStream &KCalendarCore::operator>>(QDataStream &in, KCalendarCore::Duration &duration) { in >> duration.d->mDuration >> duration.d->mDaily; return in; diff --git a/src/event.h b/src/event.h --- a/src/event.h +++ b/src/event.h @@ -33,7 +33,7 @@ #include -namespace KCalCore +namespace KCalendarCore { /** @@ -44,7 +44,7 @@ { Q_GADGET Q_PROPERTY(QDateTime dtEnd READ dtEnd WRITE setDtEnd) - Q_PROPERTY(KCalCore::Event::Transparency transparency READ transparency WRITE setTransparency) + Q_PROPERTY(KCalendarCore::Event::Transparency transparency READ transparency WRITE setTransparency) public: /** The different Event transparency types. @@ -222,7 +222,7 @@ Q_REQUIRED_RESULT bool supportsGroupwareCommunication() const override; /** - Returns the Akonadi specific sub MIME type of a KCalCore::Event. + Returns the Akonadi specific sub MIME type of a KCalendarCore::Event. */ Q_REQUIRED_RESULT static QLatin1String eventMimeType(); @@ -270,12 +270,12 @@ //@endcond }; -} // namespace KCalCore +} // namespace KCalendarCore //@cond PRIVATE -Q_DECLARE_TYPEINFO(KCalCore::Event::Ptr, Q_MOVABLE_TYPE); -Q_DECLARE_METATYPE(KCalCore::Event::Ptr) -Q_DECLARE_METATYPE(KCalCore::Event *) +Q_DECLARE_TYPEINFO(KCalendarCore::Event::Ptr, Q_MOVABLE_TYPE); +Q_DECLARE_METATYPE(KCalendarCore::Event::Ptr) +Q_DECLARE_METATYPE(KCalendarCore::Event *) //@endcond #endif diff --git a/src/event.cpp b/src/event.cpp --- a/src/event.cpp +++ b/src/event.cpp @@ -36,22 +36,22 @@ #include -using namespace KCalCore; +using namespace KCalendarCore; /** Private class that helps to provide binary compatibility between releases. @internal */ //@cond PRIVATE -class Q_DECL_HIDDEN KCalCore::Event::Private +class Q_DECL_HIDDEN KCalendarCore::Event::Private { public: Private() : mTransparency(Opaque), mMultiDayValid(false), mMultiDay(false) {} - Private(const KCalCore::Event::Private &other) + Private(const KCalendarCore::Event::Private &other) : mDtEnd(other.mDtEnd), mTransparency(other.mTransparency), mMultiDayValid(false), @@ -66,18 +66,18 @@ //@endcond Event::Event() - : d(new KCalCore::Event::Private) + : d(new KCalendarCore::Event::Private) { } Event::Event(const Event &other) - : Incidence(other), d(new KCalCore::Event::Private(*other.d)) + : Incidence(other), d(new KCalendarCore::Event::Private(*other.d)) { } Event::Event(const Incidence &other) : Incidence(other) - , d(new KCalCore::Event::Private) + , d(new KCalendarCore::Event::Private) { } @@ -315,7 +315,7 @@ Q_UNUSED(data); } -QLatin1String KCalCore::Event::mimeType() const +QLatin1String KCalendarCore::Event::mimeType() const { return Event::eventMimeType(); } diff --git a/src/exceptions.h b/src/exceptions.h --- a/src/exceptions.h +++ b/src/exceptions.h @@ -43,7 +43,7 @@ #include -namespace KCalCore +namespace KCalendarCore { class ExceptionPrivate; diff --git a/src/exceptions.cpp b/src/exceptions.cpp --- a/src/exceptions.cpp +++ b/src/exceptions.cpp @@ -36,9 +36,9 @@ #include "exceptions.h" #include "calformat.h" -using namespace KCalCore; +using namespace KCalendarCore; -namespace KCalCore { +namespace KCalendarCore { class ExceptionPrivate { diff --git a/src/filestorage.h b/src/filestorage.h --- a/src/filestorage.h +++ b/src/filestorage.h @@ -32,7 +32,7 @@ #include "kcalcore_export.h" #include "calstorage.h" -namespace KCalCore +namespace KCalendarCore { class CalFormat; @@ -65,7 +65,7 @@ */ explicit FileStorage(const Calendar::Ptr &calendar, const QString &fileName = QString(), - KCalCore::CalFormat *format = nullptr); + KCalendarCore::CalFormat *format = nullptr); /** Destructor. @@ -94,7 +94,7 @@ the calendar format to be used. FileStorage takes ownership. @see saveFormat(). */ - void setSaveFormat(KCalCore::CalFormat *format); + void setSaveFormat(KCalendarCore::CalFormat *format); /** Returns the CalFormat object used by this storage. diff --git a/src/filestorage.cpp b/src/filestorage.cpp --- a/src/filestorage.cpp +++ b/src/filestorage.cpp @@ -36,13 +36,13 @@ #include "kcalcore_debug.h" -using namespace KCalCore; +using namespace KCalendarCore; /* Private class that helps to provide binary compatibility between releases. */ //@cond PRIVATE -class Q_DECL_HIDDEN KCalCore::FileStorage::Private +class Q_DECL_HIDDEN KCalendarCore::FileStorage::Private { public: Private(const QString &fileName, CalFormat *format) diff --git a/src/freebusy.h b/src/freebusy.h --- a/src/freebusy.h +++ b/src/freebusy.h @@ -39,7 +39,7 @@ #include -namespace KCalCore +namespace KCalendarCore { class FreeBusy; @@ -53,9 +53,9 @@ class KCALCORE_EXPORT FreeBusy : public IncidenceBase { friend KCALCORE_EXPORT QDataStream &operator<<(QDataStream &s, - const KCalCore::FreeBusy::Ptr &freebusy); + const KCalendarCore::FreeBusy::Ptr &freebusy); friend KCALCORE_EXPORT QDataStream &operator>>(QDataStream &s, - KCalCore::FreeBusy::Ptr &freebusy); + KCalendarCore::FreeBusy::Ptr &freebusy); public: @@ -232,7 +232,7 @@ Q_REQUIRED_RESULT QLatin1String mimeType() const override; /** - Returns the Akonadi specific sub MIME type of a KCalCore::FreeBusy. + Returns the Akonadi specific sub MIME type of a KCalendarCore::FreeBusy. */ Q_REQUIRED_RESULT static QLatin1String freeBusyMimeType(); @@ -280,17 +280,17 @@ Serializes the @p freebusy object into the @p stream. */ KCALCORE_EXPORT QDataStream &operator<<(QDataStream &stream, - const KCalCore::FreeBusy::Ptr &freebusy); + const KCalendarCore::FreeBusy::Ptr &freebusy); /** Initializes the @p freebusy object from the @p stream. */ KCALCORE_EXPORT QDataStream &operator>>(QDataStream &stream, - KCalCore::FreeBusy::Ptr &freebusy); + KCalendarCore::FreeBusy::Ptr &freebusy); } //@cond PRIVATE -Q_DECLARE_TYPEINFO(KCalCore::FreeBusy::Ptr, Q_MOVABLE_TYPE); -Q_DECLARE_METATYPE(KCalCore::FreeBusy::Ptr) +Q_DECLARE_TYPEINFO(KCalendarCore::FreeBusy::Ptr, Q_MOVABLE_TYPE); +Q_DECLARE_METATYPE(KCalendarCore::FreeBusy::Ptr) //@endcond #endif diff --git a/src/freebusy.cpp b/src/freebusy.cpp --- a/src/freebusy.cpp +++ b/src/freebusy.cpp @@ -39,27 +39,27 @@ #include "kcalcore_debug.h" #include -using namespace KCalCore; +using namespace KCalendarCore; //@cond PRIVATE -class Q_DECL_HIDDEN KCalCore::FreeBusy::Private +class Q_DECL_HIDDEN KCalendarCore::FreeBusy::Private { private: FreeBusy *q; public: Private(FreeBusy *qq) : q(qq) {} - Private(const KCalCore::FreeBusy::Private &other, FreeBusy *qq) : q(qq) + Private(const KCalendarCore::FreeBusy::Private &other, FreeBusy *qq) : q(qq) { init(other); } Private(const FreeBusyPeriod::List &busyPeriods, FreeBusy *qq) : q(qq), mBusyPeriods(busyPeriods) {} - void init(const KCalCore::FreeBusy::Private &other); + void init(const KCalendarCore::FreeBusy::Private &other); void init(const Event::List &events, const QDateTime &start, const QDateTime &end); QDateTime mDtEnd; // end datetime @@ -69,33 +69,33 @@ bool addLocalPeriod(FreeBusy *fb, const QDateTime &start, const QDateTime &end); }; -void KCalCore::FreeBusy::Private::init(const KCalCore::FreeBusy::Private &other) +void KCalendarCore::FreeBusy::Private::init(const KCalendarCore::FreeBusy::Private &other) { mDtEnd = other.mDtEnd; mBusyPeriods = other.mBusyPeriods; } //@endcond FreeBusy::FreeBusy() - : d(new KCalCore::FreeBusy::Private(this)) + : d(new KCalendarCore::FreeBusy::Private(this)) { } FreeBusy::FreeBusy(const FreeBusy &other) : IncidenceBase(other), - d(new KCalCore::FreeBusy::Private(*other.d, this)) + d(new KCalendarCore::FreeBusy::Private(*other.d, this)) { } FreeBusy::FreeBusy(const QDateTime &start, const QDateTime &end) - : d(new KCalCore::FreeBusy::Private(this)) + : d(new KCalendarCore::FreeBusy::Private(this)) { setDtStart(start); //NOLINT false clang-analyzer-optin.cplusplus.VirtualCall setDtEnd(end); //NOLINT false clang-analyzer-optin.cplusplus.VirtualCall } FreeBusy::FreeBusy(const Event::List &events, const QDateTime &start, const QDateTime &end) - : d(new KCalCore::FreeBusy::Private(this)) + : d(new KCalendarCore::FreeBusy::Private(this)) { setDtStart(start); //NOLINT false clang-analyzer-optin.cplusplus.VirtualCall setDtEnd(end); //NOLINT false clang-analyzer-optin.cplusplus.VirtualCall @@ -192,13 +192,13 @@ //@endcond FreeBusy::FreeBusy(const Period::List &busyPeriods) - : d(new KCalCore::FreeBusy::Private(this)) + : d(new KCalendarCore::FreeBusy::Private(this)) { addPeriods(busyPeriods); } FreeBusy::FreeBusy(const FreeBusyPeriod::List &busyPeriods) - : d(new KCalCore::FreeBusy::Private(busyPeriods, this)) + : d(new KCalendarCore::FreeBusy::Private(busyPeriods, this)) { } @@ -403,24 +403,24 @@ return FreeBusy::freeBusyMimeType(); } -QLatin1String KCalCore::FreeBusy::freeBusyMimeType() +QLatin1String KCalendarCore::FreeBusy::freeBusyMimeType() { return QLatin1String("application/x-vnd.akonadi.calendar.freebusy"); } -QDataStream &KCalCore::operator<<(QDataStream &stream, const KCalCore::FreeBusy::Ptr &freebusy) +QDataStream &KCalendarCore::operator<<(QDataStream &stream, const KCalendarCore::FreeBusy::Ptr &freebusy) { - KCalCore::ICalFormat format; + KCalendarCore::ICalFormat format; QString data = format.createScheduleMessage(freebusy, iTIPPublish); return stream << data; } -QDataStream &KCalCore::operator>>(QDataStream &stream, KCalCore::FreeBusy::Ptr &freebusy) +QDataStream &KCalendarCore::operator>>(QDataStream &stream, KCalendarCore::FreeBusy::Ptr &freebusy) { QString freeBusyVCal; stream >> freeBusyVCal; - KCalCore::ICalFormat format; + KCalendarCore::ICalFormat format; freebusy = format.parseFreeBusy(freeBusyVCal); if (!freebusy) { diff --git a/src/freebusycache.h b/src/freebusycache.h --- a/src/freebusycache.h +++ b/src/freebusycache.h @@ -35,7 +35,7 @@ class QString; -namespace KCalCore +namespace KCalendarCore { class Person; diff --git a/src/freebusycache.cpp b/src/freebusycache.cpp --- a/src/freebusycache.cpp +++ b/src/freebusycache.cpp @@ -28,7 +28,7 @@ #include "freebusycache.h" -using namespace KCalCore; +using namespace KCalendarCore; FreeBusyCache::~FreeBusyCache() { diff --git a/src/freebusyperiod.h b/src/freebusyperiod.h --- a/src/freebusyperiod.h +++ b/src/freebusyperiod.h @@ -37,7 +37,7 @@ #include -namespace KCalCore +namespace KCalendarCore { /** @@ -157,21 +157,21 @@ //@endcond friend KCALCORE_EXPORT QDataStream &operator<<(QDataStream &stream, - const KCalCore::FreeBusyPeriod &period); + const KCalendarCore::FreeBusyPeriod &period); friend KCALCORE_EXPORT QDataStream &operator>>(QDataStream &stream, - KCalCore::FreeBusyPeriod &period); + KCalendarCore::FreeBusyPeriod &period); }; /** Write @p period to the datastream @p stream, in binary format. */ KCALCORE_EXPORT QDataStream &operator<<(QDataStream &stream, - const KCalCore::FreeBusyPeriod &period); + const KCalendarCore::FreeBusyPeriod &period); /** Read a Period object into @p period from @p stream, in binary format. */ -KCALCORE_EXPORT QDataStream &operator>>(QDataStream &stream, KCalCore::FreeBusyPeriod &period); +KCALCORE_EXPORT QDataStream &operator>>(QDataStream &stream, KCalendarCore::FreeBusyPeriod &period); } //@cond PRIVATE -Q_DECLARE_METATYPE(KCalCore::FreeBusyPeriod) +Q_DECLARE_METATYPE(KCalendarCore::FreeBusyPeriod) //@endcond #endif diff --git a/src/freebusyperiod.cpp b/src/freebusyperiod.cpp --- a/src/freebusyperiod.cpp +++ b/src/freebusyperiod.cpp @@ -32,10 +32,10 @@ #include "freebusyperiod.h" -using namespace KCalCore; +using namespace KCalendarCore; //@cond PRIVATE -class Q_DECL_HIDDEN KCalCore::FreeBusyPeriod::Private +class Q_DECL_HIDDEN KCalendarCore::FreeBusyPeriod::Private { public: Private(): @@ -48,27 +48,27 @@ }; //@endcond -FreeBusyPeriod::FreeBusyPeriod() : Period(), d(new KCalCore::FreeBusyPeriod::Private()) +FreeBusyPeriod::FreeBusyPeriod() : Period(), d(new KCalendarCore::FreeBusyPeriod::Private()) { } FreeBusyPeriod::FreeBusyPeriod(const QDateTime &start, const QDateTime &end) - : Period(start, end), d(new KCalCore::FreeBusyPeriod::Private()) + : Period(start, end), d(new KCalendarCore::FreeBusyPeriod::Private()) { } FreeBusyPeriod::FreeBusyPeriod(const QDateTime &start, const Duration &duration) - : Period(start, duration), d(new KCalCore::FreeBusyPeriod::Private()) + : Period(start, duration), d(new KCalendarCore::FreeBusyPeriod::Private()) { } FreeBusyPeriod::FreeBusyPeriod(const FreeBusyPeriod &period) - : Period(period), d(new KCalCore::FreeBusyPeriod::Private(*period.d)) + : Period(period), d(new KCalendarCore::FreeBusyPeriod::Private(*period.d)) { } FreeBusyPeriod::FreeBusyPeriod(const Period &period) - : Period(period), d(new KCalCore::FreeBusyPeriod::Private()) + : Period(period), d(new KCalendarCore::FreeBusyPeriod::Private()) { } @@ -119,17 +119,17 @@ d->mType = type; } -QDataStream &KCalCore::operator<<(QDataStream &stream, const KCalCore::FreeBusyPeriod &period) +QDataStream &KCalendarCore::operator<<(QDataStream &stream, const KCalendarCore::FreeBusyPeriod &period) { - KCalCore::Period periodParent = static_cast(period); + KCalendarCore::Period periodParent = static_cast(period); stream << periodParent; stream << period.summary() << period.location() << static_cast(period.type()); return stream; } -QDataStream &KCalCore::operator>>(QDataStream &stream, FreeBusyPeriod &period) +QDataStream &KCalendarCore::operator>>(QDataStream &stream, FreeBusyPeriod &period) { - KCalCore::Period periodParent; + KCalendarCore::Period periodParent; QString summary, location; int type; diff --git a/src/icalformat.h b/src/icalformat.h --- a/src/icalformat.h +++ b/src/icalformat.h @@ -34,7 +34,7 @@ #include "calformat.h" #include "schedulemessage.h" -namespace KCalCore +namespace KCalendarCore { class FreeBusy; diff --git a/src/icalformat.cpp b/src/icalformat.cpp --- a/src/icalformat.cpp +++ b/src/icalformat.cpp @@ -48,10 +48,10 @@ #include } -using namespace KCalCore; +using namespace KCalendarCore; //@cond PRIVATE -class Q_DECL_HIDDEN KCalCore::ICalFormat::Private +class Q_DECL_HIDDEN KCalendarCore::ICalFormat::Private { public: Private(ICalFormat *parent) diff --git a/src/icalformat_p.h b/src/icalformat_p.h --- a/src/icalformat_p.h +++ b/src/icalformat_p.h @@ -46,7 +46,7 @@ class QDate; -namespace KCalCore +namespace KCalendarCore { class Alarm; diff --git a/src/icalformat_p.cpp b/src/icalformat_p.cpp --- a/src/icalformat_p.cpp +++ b/src/icalformat_p.cpp @@ -51,7 +51,7 @@ #include -using namespace KCalCore; +using namespace KCalendarCore; static const char APP_NAME_FOR_XPROPERTIES[] = "KCALCORE"; static const char ENABLED_ALARM_XPROPERTY[] = "ENABLED"; @@ -3065,7 +3065,7 @@ icalcomponent *inc = writeIncidence(incidence, method); - if (method != KCalCore::iTIPNoMethod) { + if (method != KCalendarCore::iTIPNoMethod) { //Not very nice, but since dtstamp changes semantics if used in scheduling, we have to adapt icalcomponent_set_dtstamp( inc, writeICalUtcDateTime(QDateTime::currentDateTimeUtc())); diff --git a/src/icaltimezones.cpp b/src/icaltimezones.cpp --- a/src/icaltimezones.cpp +++ b/src/icaltimezones.cpp @@ -37,7 +37,7 @@ #include } -using namespace KCalCore; +using namespace KCalendarCore; // Minimum repetition counts for VTIMEZONE RRULEs static const int minRuleCount = 5; // for any RRULE @@ -85,7 +85,7 @@ return t; } -namespace KCalCore +namespace KCalendarCore { void ICalTimeZonePhase::dump() @@ -732,4 +732,4 @@ return result; } -} // namespace KCalCore +} // namespace KCalendarCore diff --git a/src/icaltimezones_p.h b/src/icaltimezones_p.h --- a/src/icaltimezones_p.h +++ b/src/icaltimezones_p.h @@ -36,7 +36,7 @@ typedef struct _icaltimezone icaltimezone; #endif -namespace KCalCore +namespace KCalendarCore { class ICalTimeZonePhase; @@ -103,7 +103,7 @@ ICalTimeZoneCache *mCache; }; -} // namespace KCalCore +} // namespace KCalendarCore inline uint qHash(const QTimeZone &tz) { diff --git a/src/incidence.h b/src/incidence.h --- a/src/incidence.h +++ b/src/incidence.h @@ -44,7 +44,7 @@ #define INVALID_LATLON 255.0 //krazy:exclude=defines (part of the API) //@endcond -namespace KCalCore +namespace KCalendarCore { /** @@ -76,8 +76,8 @@ Q_PROPERTY(QStringList categories READ categories WRITE setCategories) Q_PROPERTY(int priority READ priority WRITE setPriority) Q_PROPERTY(QDateTime created READ created WRITE setCreated) - Q_PROPERTY(KCalCore::Incidence::Secrecy secrecy READ secrecy WRITE setSecrecy) - Q_PROPERTY(KCalCore::Incidence::Status status READ status WRITE setStatus) + Q_PROPERTY(KCalendarCore::Incidence::Secrecy secrecy READ secrecy WRITE setSecrecy) + Q_PROPERTY(KCalendarCore::Incidence::Status status READ status WRITE setStatus) Q_PROPERTY(QVariantList attachments READ attachmentsVariant) public: @@ -150,7 +150,7 @@ /** Returns a unique identifier for a specific instance of an incidence. - Due to the recurrence-id, the uid is not unique for a KCalCore::Incidence. + Due to the recurrence-id, the uid is not unique for a KCalendarCore::Incidence. @since 4.11 */ Q_REQUIRED_RESULT QString instanceIdentifier() const; @@ -388,7 +388,7 @@ @param uid is a QString containing a UID for another incidence. @param relType specifies the relation type. - @warning KCalCore only supports one related-to field per reltype for now. + @warning KCalendarCore only supports one related-to field per reltype for now. @see relatedTo(). */ @@ -399,7 +399,7 @@ This function should only be used when constructing a calendar before the related incidence exists. - @warning KCalCore only supports one related-to field per reltype for now. + @warning KCalendarCore only supports one related-to field per reltype for now. @param relType specifies the relation type. @@ -862,15 +862,15 @@ } //@cond PRIVATE -inline uint qHash(const QSharedPointer &key) +inline uint qHash(const QSharedPointer &key) { return qHash(key.data()); } //@endcond //@cond PRIVATE -Q_DECLARE_TYPEINFO(KCalCore::Incidence::Ptr, Q_MOVABLE_TYPE); -Q_DECLARE_METATYPE(KCalCore::Incidence *) +Q_DECLARE_TYPEINFO(KCalendarCore::Incidence::Ptr, Q_MOVABLE_TYPE); +Q_DECLARE_METATYPE(KCalendarCore::Incidence *) //@endcond #endif diff --git a/src/incidence.cpp b/src/incidence.cpp --- a/src/incidence.cpp +++ b/src/incidence.cpp @@ -41,14 +41,14 @@ #include #include -using namespace KCalCore; +using namespace KCalendarCore; /** Private class that helps to provide binary compatibility between releases. @internal */ //@cond PRIVATE -class Q_DECL_HIDDEN KCalCore::Incidence::Private +class Q_DECL_HIDDEN KCalendarCore::Incidence::Private { public: Private() @@ -174,16 +174,16 @@ Incidence::Incidence() : IncidenceBase() - , d(new KCalCore::Incidence::Private) + , d(new KCalendarCore::Incidence::Private) { recreate(); resetDirtyFields(); } Incidence::Incidence(const Incidence &i) : IncidenceBase(i) , Recurrence::RecurrenceObserver() - , d(new KCalCore::Incidence::Private(*i.d)) + , d(new KCalendarCore::Incidence::Private(*i.d)) { d->init(this, i); resetDirtyFields(); @@ -564,7 +564,7 @@ d->mRecurrence->setStartDateTime(dateTime(RoleRecurrenceStart), allDay()); d->mRecurrence->setAllDay(allDay()); d->mRecurrence->setRecurReadOnly(mReadOnly); - d->mRecurrence->addObserver(const_cast(this)); + d->mRecurrence->addObserver(const_cast(this)); } return d->mRecurrence; @@ -1078,9 +1078,9 @@ QStringList Incidence::mimeTypes() { return QStringList() << QStringLiteral("text/calendar") - << KCalCore::Event::eventMimeType() - << KCalCore::Todo::todoMimeType() - << KCalCore::Journal::journalMimeType(); + << KCalendarCore::Event::eventMimeType() + << KCalendarCore::Todo::todoMimeType() + << KCalendarCore::Journal::journalMimeType(); } void Incidence::serialize(QDataStream &out) const @@ -1126,7 +1126,7 @@ if (hasRecurrence) { d->mRecurrence = new Recurrence(); - d->mRecurrence->addObserver(const_cast(this)); + d->mRecurrence->addObserver(const_cast(this)); in >> d->mRecurrence; } diff --git a/src/incidencebase.h b/src/incidencebase.h --- a/src/incidencebase.h +++ b/src/incidencebase.h @@ -71,7 +71,7 @@ class QDate; class QTimeZone; -namespace KCalCore { +namespace KCalendarCore { /** List of dates */ typedef QList DateList; @@ -113,7 +113,7 @@ Q_PROPERTY(QDateTime lastModified READ lastModified WRITE setLastModified) Q_PROPERTY(QDateTime dtStart READ dtStart WRITE setDtStart) Q_PROPERTY(bool allDay READ allDay WRITE setAllDay) - Q_PROPERTY(KCalCore::Person organizer READ organizer WRITE setOrganizer) + Q_PROPERTY(KCalendarCore::Person organizer READ organizer WRITE setOrganizer) Q_PROPERTY(QVariantList attendees READ attendeesVariant) public: @@ -156,7 +156,7 @@ Currently that's DTSTART for an event and DTDUE for a to-do. (NOTE: If the incidence is a to-do, recurrence should be calculated having DTSTART for a reference, not DT-DUE. - This is one place KCalCore isn't compliant with RFC2445) */ + This is one place KCalendarCore isn't compliant with RFC2445) */ RoleDisplayStart, /**< Role for display purposes, represents the start boundary of an incidence. To-dos return dtDue here, for historical reasons */ RoleDnD /**< Role for determining new start and end dates after a DnD */ @@ -645,8 +645,8 @@ virtual void setDateTime(const QDateTime &dateTime, DateTimeRole role) = 0; /** - Returns the Akonadi specific sub MIME type of a KCalCore::IncidenceBase item, - e.g. getting "application/x-vnd.akonadi.calendar.event" for a KCalCore::Event. + Returns the Akonadi specific sub MIME type of a KCalendarCore::IncidenceBase item, + e.g. getting "application/x-vnd.akonadi.calendar.event" for a KCalendarCore::Event. */ virtual QLatin1String mimeType() const = 0; @@ -679,7 +679,7 @@ void resetDirtyFields(); /** - * Constant that identifies KCalCore data in a binary stream. + * Constant that identifies KCalendarCore data in a binary stream. * * @since 4.12 */ @@ -760,27 +760,27 @@ Q_DECL_HIDDEN QVariantList attendeesVariant() const; //@endcond - friend KCALCORE_EXPORT QDataStream &operator<<(QDataStream &stream, const KCalCore::IncidenceBase::Ptr &); + friend KCALCORE_EXPORT QDataStream &operator<<(QDataStream &stream, const KCalendarCore::IncidenceBase::Ptr &); - friend KCALCORE_EXPORT QDataStream &operator>>(QDataStream &stream, KCalCore::IncidenceBase::Ptr &); + friend KCALCORE_EXPORT QDataStream &operator>>(QDataStream &stream, KCalendarCore::IncidenceBase::Ptr &); }; /** * Incidence serializer. * * @since 4.12 */ -KCALCORE_EXPORT QDataStream &operator<<(QDataStream &out, const KCalCore::IncidenceBase::Ptr &); +KCALCORE_EXPORT QDataStream &operator<<(QDataStream &out, const KCalendarCore::IncidenceBase::Ptr &); /** * Incidence deserializer. * * @since 4.12 */ -KCALCORE_EXPORT QDataStream &operator>>(QDataStream &in, KCalCore::IncidenceBase::Ptr &); +KCALCORE_EXPORT QDataStream &operator>>(QDataStream &in, KCalendarCore::IncidenceBase::Ptr &); } -Q_DECLARE_METATYPE(KCalCore::IncidenceBase *) -Q_DECLARE_METATYPE(KCalCore::IncidenceBase::Ptr) +Q_DECLARE_METATYPE(KCalendarCore::IncidenceBase *) +Q_DECLARE_METATYPE(KCalendarCore::IncidenceBase::Ptr) #endif diff --git a/src/incidencebase.cpp b/src/incidencebase.cpp --- a/src/incidencebase.cpp +++ b/src/incidencebase.cpp @@ -48,14 +48,14 @@ #define KCALCORE_MAGIC_NUMBER 0xCA1C012E #define KCALCORE_SERIALIZATION_VERSION 1 -using namespace KCalCore; +using namespace KCalendarCore; /** Private class that helps to provide binary compatibility between releases. @internal */ //@cond PRIVATE -class Q_DECL_HIDDEN KCalCore::IncidenceBase::Private +class Q_DECL_HIDDEN KCalendarCore::IncidenceBase::Private { public: Private() @@ -120,15 +120,15 @@ //@endcond IncidenceBase::IncidenceBase() - : d(new KCalCore::IncidenceBase::Private) + : d(new KCalendarCore::IncidenceBase::Private) { mReadOnly = false; setUid(CalFormat::createUniqueId()); } IncidenceBase::IncidenceBase(const IncidenceBase &i) : CustomProperties(i) - , d(new KCalCore::IncidenceBase::Private(*i.d)) + , d(new KCalendarCore::IncidenceBase::Private(*i.d)) { mReadOnly = i.mReadOnly; } @@ -666,13 +666,13 @@ return KCALCORE_MAGIC_NUMBER; } -QDataStream &KCalCore::operator<<(QDataStream &out, const KCalCore::IncidenceBase::Ptr &i) +QDataStream &KCalendarCore::operator<<(QDataStream &out, const KCalendarCore::IncidenceBase::Ptr &i) { if (!i) { return out; } - out << static_cast(KCALCORE_MAGIC_NUMBER); // Magic number to identify KCalCore data + out << static_cast(KCALCORE_MAGIC_NUMBER); // Magic number to identify KCalendarCore data out << static_cast(KCALCORE_SERIALIZATION_VERSION); out << static_cast(i->type()); @@ -693,7 +693,7 @@ return out; } -QDataStream &KCalCore::operator>>(QDataStream &in, KCalCore::IncidenceBase::Ptr &i) +QDataStream &KCalendarCore::operator>>(QDataStream &in, KCalendarCore::IncidenceBase::Ptr &i) { if (!i) { return in; diff --git a/src/journal.h b/src/journal.h --- a/src/journal.h +++ b/src/journal.h @@ -33,7 +33,7 @@ #include "kcalcore_export.h" #include "incidence.h" -namespace KCalCore +namespace KCalendarCore { /** @@ -117,7 +117,7 @@ Q_REQUIRED_RESULT bool supportsGroupwareCommunication() const override; /** - Returns the Akonadi specific sub MIME type of a KCalCore::Journal. + Returns the Akonadi specific sub MIME type of a KCalendarCore::Journal. */ Q_REQUIRED_RESULT static QLatin1String journalMimeType(); @@ -166,12 +166,12 @@ //@endcond }; -} // namespace KCalCore +} // namespace KCalendarCore //@cond PRIVATE -Q_DECLARE_TYPEINFO(KCalCore::Journal::Ptr, Q_MOVABLE_TYPE); -Q_DECLARE_METATYPE(KCalCore::Journal::Ptr) -Q_DECLARE_METATYPE(KCalCore::Journal *) +Q_DECLARE_TYPEINFO(KCalendarCore::Journal::Ptr, Q_MOVABLE_TYPE); +Q_DECLARE_METATYPE(KCalendarCore::Journal::Ptr) +Q_DECLARE_METATYPE(KCalendarCore::Journal *) //@endcond #endif diff --git a/src/journal.cpp b/src/journal.cpp --- a/src/journal.cpp +++ b/src/journal.cpp @@ -34,7 +34,7 @@ #include "kcalcore_debug.h" -using namespace KCalCore; +using namespace KCalendarCore; Journal::Journal() : d(nullptr) { diff --git a/src/memorycalendar.h b/src/memorycalendar.h --- a/src/memorycalendar.h +++ b/src/memorycalendar.h @@ -35,7 +35,7 @@ #include "kcalcore_export.h" #include "calendar.h" -namespace KCalCore +namespace KCalendarCore { /** @brief diff --git a/src/memorycalendar.cpp b/src/memorycalendar.cpp --- a/src/memorycalendar.cpp +++ b/src/memorycalendar.cpp @@ -62,14 +62,14 @@ return v; } -using namespace KCalCore; +using namespace KCalendarCore; /** Private class that helps to provide binary compatibility between releases. @internal */ //@cond PRIVATE -class Q_DECL_HIDDEN KCalCore::MemoryCalendar::Private +class Q_DECL_HIDDEN KCalendarCore::MemoryCalendar::Private { public: Private(MemoryCalendar *qq) @@ -93,7 +93,7 @@ /** * Has all incidences, indexed by identifier. */ - QHash mIncidencesByIdentifier; + QHash mIncidencesByIdentifier; /** * List of all deleted incidences. @@ -131,13 +131,13 @@ MemoryCalendar::MemoryCalendar(const QTimeZone &timeZone) : Calendar(timeZone), - d(new KCalCore::MemoryCalendar::Private(this)) + d(new KCalendarCore::MemoryCalendar::Private(this)) { } MemoryCalendar::MemoryCalendar(const QByteArray &timeZoneId) : Calendar(timeZoneId), - d(new KCalCore::MemoryCalendar::Private(this)) + d(new KCalendarCore::MemoryCalendar::Private(this)) { } diff --git a/src/occurrenceiterator.h b/src/occurrenceiterator.h --- a/src/occurrenceiterator.h +++ b/src/occurrenceiterator.h @@ -32,7 +32,7 @@ #include "kcalcore_export.h" #include "incidence.h" -namespace KCalCore +namespace KCalendarCore { class Calendar; @@ -60,7 +60,7 @@ * of @param incidence between @param start and @param end (inclusive) */ OccurrenceIterator(const Calendar &calendar, - const KCalCore::Incidence::Ptr &incidence, + const KCalendarCore::Incidence::Ptr &incidence, const QDateTime &start = QDateTime(), const QDateTime &end = QDateTime()); ~OccurrenceIterator(); diff --git a/src/occurrenceiterator.cpp b/src/occurrenceiterator.cpp --- a/src/occurrenceiterator.cpp +++ b/src/occurrenceiterator.cpp @@ -36,14 +36,14 @@ #include -using namespace KCalCore; +using namespace KCalendarCore; /** Private class that helps to provide binary compatibility between releases. @internal */ //@cond PRIVATE -class Q_DECL_HIDDEN KCalCore::OccurrenceIterator::Private +class Q_DECL_HIDDEN KCalendarCore::OccurrenceIterator::Private { public: Private(OccurrenceIterator *qq) @@ -75,7 +75,7 @@ Occurrence current; /* - * KCalCore::CalFilter can't handle individual occurrences. + * KCalendarCore::CalFilter can't handle individual occurrences. * When filtering completed to-dos, the CalFilter doesn't hide * them if it's a recurring to-do. */ @@ -85,7 +85,7 @@ { if ((inc->type() == Incidence::TypeTodo) && calendar.filter() && - (calendar.filter()->criteria() & KCalCore::CalFilter::HideCompletedTodos)) { + (calendar.filter()->criteria() & KCalendarCore::CalFilter::HideCompletedTodos)) { if (inc->recurs()) { const Todo::Ptr todo = inc.staticCast(); if (todo && (occurrenceDate < todo->dtDue())) { @@ -178,7 +178,7 @@ OccurrenceIterator::OccurrenceIterator(const Calendar &calendar, const QDateTime &start, const QDateTime &end) - : d(new KCalCore::OccurrenceIterator::Private(this)) + : d(new KCalendarCore::OccurrenceIterator::Private(this)) { d->start = start; d->end = end; @@ -195,7 +195,7 @@ Journal::List journals; const Journal::List allJournals = calendar.rawJournals(); - for (const KCalCore::Journal::Ptr &journal : allJournals) { + for (const KCalendarCore::Journal::Ptr &journal : allJournals) { const QDate journalStart = journal->dtStart().toTimeZone(start.timeZone()).date(); if (journal->dtStart().isValid() && journalStart >= start.date() && @@ -209,15 +209,15 @@ } const Incidence::List incidences = - KCalCore::Calendar::mergeIncidenceList(events, todos, journals); + KCalendarCore::Calendar::mergeIncidenceList(events, todos, journals); d->setupIterator(calendar, incidences); } OccurrenceIterator::OccurrenceIterator(const Calendar &calendar, const Incidence::Ptr &incidence, const QDateTime &start, const QDateTime &end) - : d(new KCalCore::OccurrenceIterator::Private(this)) + : d(new KCalendarCore::OccurrenceIterator::Private(this)) { Q_ASSERT(incidence); d->start = start; diff --git a/src/period.h b/src/period.h --- a/src/period.h +++ b/src/period.h @@ -41,7 +41,7 @@ class QTimeZone; -namespace KCalCore +namespace KCalendarCore { /** @@ -203,28 +203,28 @@ //@endcond friend KCALCORE_EXPORT QDataStream &operator<<(QDataStream &stream, - const KCalCore::Period &period); + const KCalendarCore::Period &period); friend KCALCORE_EXPORT QDataStream &operator>>(QDataStream &stream, - KCalCore::Period &period); + KCalendarCore::Period &period); }; /** Write @p period to the datastream @p stream, in binary format. */ -KCALCORE_EXPORT QDataStream &operator<<(QDataStream &stream, const KCalCore::Period &period); +KCALCORE_EXPORT QDataStream &operator<<(QDataStream &stream, const KCalendarCore::Period &period); /** Read a Period object into @p period from @p stream, in binary format. */ -KCALCORE_EXPORT QDataStream &operator>>(QDataStream &stream, KCalCore::Period &period); +KCALCORE_EXPORT QDataStream &operator>>(QDataStream &stream, KCalendarCore::Period &period); /** Return a hash value for a Period argument. @param key is a Period. */ -KCALCORE_EXPORT uint qHash(const KCalCore::Period &key); +KCALCORE_EXPORT uint qHash(const KCalendarCore::Period &key); } //@cond PRIVATE -Q_DECLARE_METATYPE(KCalCore::Period) -Q_DECLARE_TYPEINFO(KCalCore::Period, Q_MOVABLE_TYPE); +Q_DECLARE_METATYPE(KCalendarCore::Period) +Q_DECLARE_TYPEINFO(KCalendarCore::Period, Q_MOVABLE_TYPE); //@endcond #endif diff --git a/src/period.cpp b/src/period.cpp --- a/src/period.cpp +++ b/src/period.cpp @@ -36,10 +36,10 @@ #include #include -using namespace KCalCore; +using namespace KCalendarCore; //@cond PRIVATE -class Q_DECL_HIDDEN KCalCore::Period::Private +class Q_DECL_HIDDEN KCalendarCore::Period::Private { public: Private() : mHasDuration(false), mDailyDuration(false) {} @@ -56,23 +56,23 @@ }; //@endcond -Period::Period() : d(new KCalCore::Period::Private()) +Period::Period() : d(new KCalendarCore::Period::Private()) { } Period::Period(const QDateTime &start, const QDateTime &end) - : d(new KCalCore::Period::Private(start, end, false)) + : d(new KCalendarCore::Period::Private(start, end, false)) { } Period::Period(const QDateTime &start, const Duration &duration) - : d(new KCalCore::Period::Private(start, duration.end(start), true)) + : d(new KCalendarCore::Period::Private(start, duration.end(start), true)) { d->mDailyDuration = duration.isDaily(); } Period::Period(const Period &period) - : d(new KCalCore::Period::Private(*period.d)) + : d(new KCalendarCore::Period::Private(*period.d)) { } @@ -147,24 +147,24 @@ } } -QDataStream &KCalCore::operator<<(QDataStream &stream, const KCalCore::Period &period) +QDataStream &KCalendarCore::operator<<(QDataStream &stream, const KCalendarCore::Period &period) { serializeQDateTimeAsKDateTime(stream, period.d->mStart); serializeQDateTimeAsKDateTime(stream, period.d->mEnd); return stream << period.d->mDailyDuration << period.d->mHasDuration; } -QDataStream &KCalCore::operator>>(QDataStream &stream, KCalCore::Period &period) +QDataStream &KCalendarCore::operator>>(QDataStream &stream, KCalendarCore::Period &period) { deserializeKDateTimeAsQDateTime(stream, period.d->mStart); deserializeKDateTimeAsQDateTime(stream, period.d->mEnd); stream >> period.d->mDailyDuration >> period.d->mHasDuration; return stream; } -uint KCalCore::qHash(const KCalCore::Period &key) +uint KCalendarCore::qHash(const KCalendarCore::Period &key) { if (key.hasDuration()) { return qHash(key.duration()); diff --git a/src/person.h b/src/person.h --- a/src/person.h +++ b/src/person.h @@ -38,7 +38,7 @@ #include #include -namespace KCalCore +namespace KCalendarCore { /** @@ -179,31 +179,31 @@ QSharedDataPointer d; //@endcond - friend KCALCORE_EXPORT QDataStream &operator<<(QDataStream &s, const KCalCore::Person &person); - friend KCALCORE_EXPORT QDataStream &operator>>(QDataStream &s, KCalCore::Person &person); + friend KCALCORE_EXPORT QDataStream &operator<<(QDataStream &s, const KCalendarCore::Person &person); + friend KCALCORE_EXPORT QDataStream &operator>>(QDataStream &s, KCalendarCore::Person &person); }; /** Serializes the @p person object into the @p stream. */ -KCALCORE_EXPORT QDataStream &operator<<(QDataStream &stream, const KCalCore::Person &person); +KCALCORE_EXPORT QDataStream &operator<<(QDataStream &stream, const KCalendarCore::Person &person); /** Initializes the @p person object from the @p stream. */ -KCALCORE_EXPORT QDataStream &operator>>(QDataStream &stream, KCalCore::Person &person); +KCALCORE_EXPORT QDataStream &operator>>(QDataStream &stream, KCalendarCore::Person &person); /** Return a hash value for a Person argument. @param key is a Person. */ -KCALCORE_EXPORT uint qHash(const KCalCore::Person &key); +KCALCORE_EXPORT uint qHash(const KCalendarCore::Person &key); } //@cond PRIVATE -Q_DECLARE_TYPEINFO(KCalCore::Person, Q_MOVABLE_TYPE); -Q_DECLARE_METATYPE(KCalCore::Person) +Q_DECLARE_TYPEINFO(KCalendarCore::Person, Q_MOVABLE_TYPE); +Q_DECLARE_METATYPE(KCalendarCore::Person) //@endcond #endif diff --git a/src/person.cpp b/src/person.cpp --- a/src/person.cpp +++ b/src/person.cpp @@ -38,27 +38,27 @@ #include #include -using namespace KCalCore; +using namespace KCalendarCore; /** Private class that helps to provide binary compatibility between releases. @internal */ //@cond PRIVATE -class Q_DECL_HIDDEN KCalCore::Person::Private : public QSharedData +class Q_DECL_HIDDEN KCalendarCore::Person::Private : public QSharedData { public: QString mName; // person name QString mEmail; // person email address }; //@endcond -Person::Person() : d(new KCalCore::Person::Private) +Person::Person() : d(new KCalendarCore::Person::Private) { } Person::Person(const QString &name, const QString &email) - : d(new KCalCore::Person::Private) + : d(new KCalendarCore::Person::Private) { d->mName = name; d->mEmail = email; @@ -71,19 +71,19 @@ Person::~Person() = default; -bool KCalCore::Person::operator==(const Person &person) const +bool KCalendarCore::Person::operator==(const Person &person) const { return d->mName == person.d->mName && d->mEmail == person.d->mEmail; } -bool KCalCore::Person::operator!=(const Person &person) const +bool KCalendarCore::Person::operator!=(const Person &person) const { return !(*this == person); } -Person &KCalCore::Person::operator=(const Person &person) +Person &KCalendarCore::Person::operator=(const Person &person) { // check for self assignment if (&person == this) { @@ -94,7 +94,7 @@ return *this; } -QString KCalCore::fullNameHelper(const QString &name, const QString &email) +QString KCalendarCore::fullNameHelper(const QString &name, const QString &email) { if (name.isEmpty()) { return email; @@ -157,20 +157,20 @@ return (pos > 0) && (email.lastIndexOf(QLatin1Char('.')) > pos) && ((email.length() - pos) > 4); } -uint KCalCore::qHash(const KCalCore::Person &key) +uint KCalendarCore::qHash(const KCalendarCore::Person &key) { return qHash(key.fullName()); } -QDataStream &KCalCore::operator<<(QDataStream &stream, const KCalCore::Person &person) +QDataStream &KCalendarCore::operator<<(QDataStream &stream, const KCalendarCore::Person &person) { return stream << person.d->mName << person.d->mEmail << (int)(0); } -QDataStream &KCalCore::operator>>(QDataStream &stream, Person &person) +QDataStream &KCalendarCore::operator>>(QDataStream &stream, Person &person) { int count; stream >> person.d->mName >> person.d->mEmail >> count; diff --git a/src/person_p.h b/src/person_p.h --- a/src/person_p.h +++ b/src/person_p.h @@ -24,7 +24,7 @@ class QString; -namespace KCalCore +namespace KCalendarCore { QString fullNameHelper(const QString &name, const QString &email); } diff --git a/src/recurrence.h b/src/recurrence.h --- a/src/recurrence.h +++ b/src/recurrence.h @@ -30,7 +30,7 @@ class QBitArray; class QTimeZone; -namespace KCalCore +namespace KCalendarCore { class RecurrenceRule; @@ -662,16 +662,16 @@ Private *const d; //@endcond - friend KCALCORE_EXPORT QDataStream &operator<<(QDataStream &out, KCalCore::Recurrence *); - friend KCALCORE_EXPORT QDataStream &operator>>(QDataStream &in, KCalCore::Recurrence *); + friend KCALCORE_EXPORT QDataStream &operator<<(QDataStream &out, KCalendarCore::Recurrence *); + friend KCALCORE_EXPORT QDataStream &operator>>(QDataStream &in, KCalendarCore::Recurrence *); }; /** * Recurrence serializer and deserializer. * @since 4.12 */ -KCALCORE_EXPORT QDataStream &operator<<(QDataStream &out, KCalCore::Recurrence *); -KCALCORE_EXPORT QDataStream &operator>>(QDataStream &in, KCalCore::Recurrence *); +KCALCORE_EXPORT QDataStream &operator<<(QDataStream &out, KCalendarCore::Recurrence *); +KCALCORE_EXPORT QDataStream &operator>>(QDataStream &in, KCalendarCore::Recurrence *); } diff --git a/src/recurrence.cpp b/src/recurrence.cpp --- a/src/recurrence.cpp +++ b/src/recurrence.cpp @@ -32,10 +32,10 @@ #include #include -using namespace KCalCore; +using namespace KCalendarCore; //@cond PRIVATE -class Q_DECL_HIDDEN KCalCore::Recurrence::Private +class Q_DECL_HIDDEN KCalendarCore::Recurrence::Private { public: Private() @@ -115,13 +115,13 @@ //@endcond Recurrence::Recurrence() - : d(new KCalCore::Recurrence::Private()) + : d(new KCalendarCore::Recurrence::Private()) { } Recurrence::Recurrence(const Recurrence &r) : RecurrenceRule::RuleObserver(), - d(new KCalCore::Recurrence::Private(*r.d)) + d(new KCalendarCore::Recurrence::Private(*r.d)) { int i, end; d->mRRules.reserve(r.d->mRRules.count()); @@ -207,7 +207,7 @@ } RecurrenceRule *rrule = new RecurrenceRule(); rrule->setStartDt(startDateTime()); - const_cast(this)->addRRule(rrule); + const_cast(this)->addRRule(rrule); return rrule; } else { return d->mRRules[0]; @@ -1493,7 +1493,7 @@ { } -KCALCORE_EXPORT QDataStream &KCalCore::operator<<(QDataStream &out, KCalCore::Recurrence *r) +KCALCORE_EXPORT QDataStream &KCalendarCore::operator<<(QDataStream &out, KCalendarCore::Recurrence *r) { if (!r) { return out; @@ -1518,7 +1518,7 @@ return out; } -KCALCORE_EXPORT QDataStream &KCalCore::operator>>(QDataStream &in, KCalCore::Recurrence *r) +KCALCORE_EXPORT QDataStream &KCalendarCore::operator>>(QDataStream &in, KCalendarCore::Recurrence *r) { if (!r) { return in; diff --git a/src/recurrencehelper_p.h b/src/recurrencehelper_p.h --- a/src/recurrencehelper_p.h +++ b/src/recurrencehelper_p.h @@ -24,7 +24,7 @@ #include -namespace KCalCore { +namespace KCalendarCore { template inline void sortAndRemoveDuplicates(T &container) diff --git a/src/recurrencerule.h b/src/recurrencerule.h --- a/src/recurrencerule.h +++ b/src/recurrencerule.h @@ -31,7 +31,7 @@ class QTimeZone; -namespace KCalCore { +namespace KCalendarCore { // These two are duplicates wrt. incidencebase.h typedef QList DateList; /* List of times */ @@ -82,8 +82,8 @@ int mPos; // week of the day (-1 for last, 1 for first, 0 for all weeks) // Bounded by -366 and +366, 0 means all weeks in that period - friend KCALCORE_EXPORT QDataStream &operator<<(QDataStream &out, const KCalCore::RecurrenceRule::WDayPos &); - friend KCALCORE_EXPORT QDataStream &operator>>(QDataStream &in, KCalCore::RecurrenceRule::WDayPos &); + friend KCALCORE_EXPORT QDataStream &operator<<(QDataStream &out, const KCalendarCore::RecurrenceRule::WDayPos &); + friend KCALCORE_EXPORT QDataStream &operator>>(QDataStream &in, KCalendarCore::RecurrenceRule::WDayPos &); }; RecurrenceRule(); @@ -325,25 +325,25 @@ Private *const d; //@endcond - friend KCALCORE_EXPORT QDataStream &operator<<(QDataStream &out, const KCalCore::RecurrenceRule *); - friend KCALCORE_EXPORT QDataStream &operator>>(QDataStream &in, const KCalCore::RecurrenceRule *); + friend KCALCORE_EXPORT QDataStream &operator<<(QDataStream &out, const KCalendarCore::RecurrenceRule *); + friend KCALCORE_EXPORT QDataStream &operator>>(QDataStream &in, const KCalendarCore::RecurrenceRule *); }; /** * RecurrenceRule serializer and deserializer. * @since 4.12 */ -KCALCORE_EXPORT QDataStream &operator<<(QDataStream &out, const KCalCore::RecurrenceRule *); -KCALCORE_EXPORT QDataStream &operator>>(QDataStream &in, const KCalCore::RecurrenceRule *); +KCALCORE_EXPORT QDataStream &operator<<(QDataStream &out, const KCalendarCore::RecurrenceRule *); +KCALCORE_EXPORT QDataStream &operator>>(QDataStream &in, const KCalendarCore::RecurrenceRule *); /** * RecurrenceRule::WDayPos serializer and deserializer. * @since 4.12 */ -KCALCORE_EXPORT QDataStream &operator<<(QDataStream &out, const KCalCore::RecurrenceRule::WDayPos &); -KCALCORE_EXPORT QDataStream &operator>>(QDataStream &in, KCalCore::RecurrenceRule::WDayPos &); +KCALCORE_EXPORT QDataStream &operator<<(QDataStream &out, const KCalendarCore::RecurrenceRule::WDayPos &); +KCALCORE_EXPORT QDataStream &operator>>(QDataStream &in, KCalendarCore::RecurrenceRule::WDayPos &); } -Q_DECLARE_TYPEINFO(KCalCore::RecurrenceRule::WDayPos, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(KCalendarCore::RecurrenceRule::WDayPos, Q_MOVABLE_TYPE); #endif diff --git a/src/recurrencerule.cpp b/src/recurrencerule.cpp --- a/src/recurrencerule.cpp +++ b/src/recurrencerule.cpp @@ -30,7 +30,7 @@ #include #include -using namespace KCalCore; +using namespace KCalendarCore; // Maximum number of intervals to process const int LOOP_LIMIT = 10000; @@ -701,7 +701,7 @@ **************************************************************************/ //@cond PRIVATE -class Q_DECL_HIDDEN KCalCore::RecurrenceRule::Private +class Q_DECL_HIDDEN KCalendarCore::RecurrenceRule::Private { public: Private(RecurrenceRule *parent) @@ -2277,19 +2277,19 @@ return in; } -KCALCORE_EXPORT QDataStream &KCalCore::operator<<(QDataStream &out, const KCalCore::RecurrenceRule::WDayPos &w) +KCALCORE_EXPORT QDataStream &KCalendarCore::operator<<(QDataStream &out, const KCalendarCore::RecurrenceRule::WDayPos &w) { out << w.mDay << w.mPos; return out; } -KCALCORE_EXPORT QDataStream &KCalCore::operator>>(QDataStream &in, KCalCore::RecurrenceRule::WDayPos &w) +KCALCORE_EXPORT QDataStream &KCalendarCore::operator>>(QDataStream &in, KCalendarCore::RecurrenceRule::WDayPos &w) { in >> w.mDay >> w.mPos; return in; } -KCALCORE_EXPORT QDataStream &KCalCore::operator<<(QDataStream &out, const KCalCore::RecurrenceRule *r) +KCALCORE_EXPORT QDataStream &KCalendarCore::operator<<(QDataStream &out, const KCalendarCore::RecurrenceRule *r) { if (!r) { return out; @@ -2308,7 +2308,7 @@ return out; } -KCALCORE_EXPORT QDataStream &KCalCore::operator>>(QDataStream &in, const KCalCore::RecurrenceRule *r) +KCALCORE_EXPORT QDataStream &KCalendarCore::operator>>(QDataStream &in, const KCalendarCore::RecurrenceRule *r) { if (!r) { return in; diff --git a/src/schedulemessage.h b/src/schedulemessage.h --- a/src/schedulemessage.h +++ b/src/schedulemessage.h @@ -25,7 +25,7 @@ #include "kcalcore_export.h" -namespace KCalCore +namespace KCalendarCore { class IncidenceBase; diff --git a/src/schedulemessage.cpp b/src/schedulemessage.cpp --- a/src/schedulemessage.cpp +++ b/src/schedulemessage.cpp @@ -25,10 +25,10 @@ #include -using namespace KCalCore; +using namespace KCalendarCore; //@cond PRIVATE -class Q_DECL_HIDDEN KCalCore::ScheduleMessage::Private +class Q_DECL_HIDDEN KCalendarCore::ScheduleMessage::Private { public: Private() {} @@ -45,7 +45,7 @@ ScheduleMessage::ScheduleMessage(const IncidenceBase::Ptr &incidence, iTIPMethod method, ScheduleMessage::Status status) - : d(new KCalCore::ScheduleMessage::Private) + : d(new KCalendarCore::ScheduleMessage::Private) { d->mIncidence = incidence; d->mMethod = method; diff --git a/src/sorting.h b/src/sorting.h --- a/src/sorting.h +++ b/src/sorting.h @@ -30,7 +30,7 @@ #include "kcalcore_export.h" -namespace KCalCore { +namespace KCalendarCore { namespace Events { KCALCORE_EXPORT bool startDateLessThan(const Event::Ptr &e1, const Event::Ptr &e2); diff --git a/src/sorting.cpp b/src/sorting.cpp --- a/src/sorting.cpp +++ b/src/sorting.cpp @@ -30,7 +30,7 @@ // See http://qt.gitorious.org/maemo-6-ui-framework/libdui // If not compiled in "meego-mode" should we be using locale compares? -using namespace KCalCore; +using namespace KCalendarCore; /** * How one QDateTime compares with another. @@ -189,7 +189,7 @@ return (start1 == start2) ? Equal : (start1 < start2) ? Before : After; } -bool KCalCore::Events::startDateLessThan(const Event::Ptr &e1, const Event::Ptr &e2) +bool KCalendarCore::Events::startDateLessThan(const Event::Ptr &e1, const Event::Ptr &e2) { DateTimeComparison res = compare(e1->dtStart(), e1->allDay(), e2->dtStart(), e2->allDay()); if (res == Equal) { @@ -199,7 +199,7 @@ } } -bool KCalCore::Events::startDateMoreThan(const Event::Ptr &e1, const Event::Ptr &e2) +bool KCalendarCore::Events::startDateMoreThan(const Event::Ptr &e1, const Event::Ptr &e2) { DateTimeComparison res = compare(e1->dtStart(), e1->allDay(), e2->dtStart(), e2->allDay()); if (res == Equal) { @@ -209,17 +209,17 @@ } } -bool KCalCore::Events::summaryLessThan(const Event::Ptr &e1, const Event::Ptr &e2) +bool KCalendarCore::Events::summaryLessThan(const Event::Ptr &e1, const Event::Ptr &e2) { return QString::compare(e1->summary(), e2->summary(), Qt::CaseInsensitive) < 0; } -bool KCalCore::Events::summaryMoreThan(const Event::Ptr &e1, const Event::Ptr &e2) +bool KCalendarCore::Events::summaryMoreThan(const Event::Ptr &e1, const Event::Ptr &e2) { return QString::compare(e1->summary(), e2->summary(), Qt::CaseInsensitive) > 0; } -bool KCalCore::Events::endDateLessThan(const Event::Ptr &e1, const Event::Ptr &e2) +bool KCalendarCore::Events::endDateLessThan(const Event::Ptr &e1, const Event::Ptr &e2) { DateTimeComparison res = compare(e1->dtEnd(), e1->allDay(), e2->dtEnd(), e2->allDay()); if (res == Equal) { @@ -229,7 +229,7 @@ } } -bool KCalCore::Events::endDateMoreThan(const Event::Ptr &e1, const Event::Ptr &e2) +bool KCalendarCore::Events::endDateMoreThan(const Event::Ptr &e1, const Event::Ptr &e2) { DateTimeComparison res = compare(e1->dtEnd(), e1->allDay(), e2->dtEnd(), e2->allDay()); if (res == Equal) { @@ -239,29 +239,29 @@ } } -bool KCalCore::Journals::dateLessThan(const Journal::Ptr &j1, const Journal::Ptr &j2) +bool KCalendarCore::Journals::dateLessThan(const Journal::Ptr &j1, const Journal::Ptr &j2) { DateTimeComparison res = compare(j1->dtStart(), j1->allDay(), j2->dtStart(), j2->allDay()); return (res & Before || res & AtStart); } -bool KCalCore::Journals::dateMoreThan(const Journal::Ptr &j1, const Journal::Ptr &j2) +bool KCalendarCore::Journals::dateMoreThan(const Journal::Ptr &j1, const Journal::Ptr &j2) { DateTimeComparison res = compare(j1->dtStart(), j1->allDay(), j2->dtStart(), j2->allDay()); return (res & After || res & AtEnd); } -bool KCalCore::Journals::summaryLessThan(const Journal::Ptr &j1, const Journal::Ptr &j2) +bool KCalendarCore::Journals::summaryLessThan(const Journal::Ptr &j1, const Journal::Ptr &j2) { return QString::compare(j1->summary(), j2->summary(), Qt::CaseInsensitive) < 0; } -bool KCalCore::Journals::summaryMoreThan(const Journal::Ptr &j1, const Journal::Ptr &j2) +bool KCalendarCore::Journals::summaryMoreThan(const Journal::Ptr &j1, const Journal::Ptr &j2) { return QString::compare(j1->summary(), j2->summary(), Qt::CaseInsensitive) > 0; } -bool KCalCore::Todos::startDateLessThan(const Todo::Ptr &t1, const Todo::Ptr &t2) +bool KCalendarCore::Todos::startDateLessThan(const Todo::Ptr &t1, const Todo::Ptr &t2) { DateTimeComparison res = compare(t1->dtStart(), t1->allDay(), t2->dtStart(), t2->allDay()); if (res == Equal) { @@ -271,7 +271,7 @@ } } -bool KCalCore::Todos::startDateMoreThan(const Todo::Ptr &t1, const Todo::Ptr &t2) +bool KCalendarCore::Todos::startDateMoreThan(const Todo::Ptr &t1, const Todo::Ptr &t2) { DateTimeComparison res = compare(t1->dtStart(), t1->allDay(), t2->dtStart(), t2->allDay()); if (res == Equal) { @@ -281,7 +281,7 @@ } } -bool KCalCore::Todos::dueDateLessThan(const Todo::Ptr &t1, const Todo::Ptr &t2) +bool KCalendarCore::Todos::dueDateLessThan(const Todo::Ptr &t1, const Todo::Ptr &t2) { DateTimeComparison res = compare(t1->dtDue(), t1->allDay(), t2->dtDue(), t2->allDay()); if (res == Equal) { @@ -291,7 +291,7 @@ } } -bool KCalCore::Todos::dueDateMoreThan(const Todo::Ptr &t1, const Todo::Ptr &t2) +bool KCalendarCore::Todos::dueDateMoreThan(const Todo::Ptr &t1, const Todo::Ptr &t2) { DateTimeComparison res = compare(t1->dtDue(), t1->allDay(), t2->dtDue(), t2->allDay()); if (res == Equal) { @@ -301,7 +301,7 @@ } } -bool KCalCore::Todos::priorityLessThan(const Todo::Ptr &t1, const Todo::Ptr &t2) +bool KCalendarCore::Todos::priorityLessThan(const Todo::Ptr &t1, const Todo::Ptr &t2) { if (t1->priority() < t2->priority()) { return true; @@ -312,7 +312,7 @@ } } -bool KCalCore::Todos::priorityMoreThan(const Todo::Ptr &t1, const Todo::Ptr &t2) +bool KCalendarCore::Todos::priorityMoreThan(const Todo::Ptr &t1, const Todo::Ptr &t2) { if (t1->priority() > t2->priority()) { return true; @@ -323,7 +323,7 @@ } } -bool KCalCore::Todos::percentLessThan(const Todo::Ptr &t1, const Todo::Ptr &t2) +bool KCalendarCore::Todos::percentLessThan(const Todo::Ptr &t1, const Todo::Ptr &t2) { if (t1->percentComplete() < t2->percentComplete()) { return true; @@ -334,7 +334,7 @@ } } -bool KCalCore::Todos::percentMoreThan(const Todo::Ptr &t1, const Todo::Ptr &t2) +bool KCalendarCore::Todos::percentMoreThan(const Todo::Ptr &t1, const Todo::Ptr &t2) { if (t1->percentComplete() > t2->percentComplete()) { return true; @@ -345,17 +345,17 @@ } } -bool KCalCore::Todos::summaryLessThan(const Todo::Ptr &t1, const Todo::Ptr &t2) +bool KCalendarCore::Todos::summaryLessThan(const Todo::Ptr &t1, const Todo::Ptr &t2) { return QString::compare(t1->summary(), t2->summary(), Qt::CaseInsensitive) < 0; } -bool KCalCore::Todos::summaryMoreThan(const Todo::Ptr &t1, const Todo::Ptr &t2) +bool KCalendarCore::Todos::summaryMoreThan(const Todo::Ptr &t1, const Todo::Ptr &t2) { return QString::compare(t1->summary(), t2->summary(), Qt::CaseInsensitive) > 0; } -bool KCalCore::Todos::createdLessThan(const Todo::Ptr &t1, const Todo::Ptr &t2) +bool KCalendarCore::Todos::createdLessThan(const Todo::Ptr &t1, const Todo::Ptr &t2) { DateTimeComparison res = compare(t1->created(), t1->allDay(), t2->created(), t2->allDay()); if (res == Equal) { @@ -365,7 +365,7 @@ } } -bool KCalCore::Todos::createdMoreThan(const Todo::Ptr &t1, const Todo::Ptr &t2) +bool KCalendarCore::Todos::createdMoreThan(const Todo::Ptr &t1, const Todo::Ptr &t2) { DateTimeComparison res = compare(t1->created(), t1->allDay(), t2->created(), t2->allDay()); if (res == Equal) { @@ -375,7 +375,7 @@ } } -bool KCalCore::Incidences::dateLessThan(const Incidence::Ptr &i1, +bool KCalendarCore::Incidences::dateLessThan(const Incidence::Ptr &i1, const Incidence::Ptr &i2) { DateTimeComparison res = compare(i1->dateTime(Incidence::RoleSort), i1->allDay(), @@ -387,7 +387,7 @@ } } -bool KCalCore::Incidences::dateMoreThan(const Incidence::Ptr &i1, +bool KCalendarCore::Incidences::dateMoreThan(const Incidence::Ptr &i1, const Incidence::Ptr &i2) { DateTimeComparison res = compare(i1->dateTime(Incidence::RoleSort), i1->allDay(), @@ -399,7 +399,7 @@ } } -bool KCalCore::Incidences::createdLessThan(const Incidence::Ptr &i1, +bool KCalendarCore::Incidences::createdLessThan(const Incidence::Ptr &i1, const Incidence::Ptr &i2) { DateTimeComparison res = compare(i1->created(), i1->allDay(), i2->created(), i2->allDay()); @@ -410,7 +410,7 @@ } } -bool KCalCore::Incidences::createdMoreThan(const Incidence::Ptr &i1, +bool KCalendarCore::Incidences::createdMoreThan(const Incidence::Ptr &i1, const Incidence::Ptr &i2) { DateTimeComparison res = compare(i1->created(), i1->allDay(), i2->created(), i2->allDay()); @@ -421,13 +421,13 @@ } } -bool KCalCore::Incidences::summaryLessThan(const Incidence::Ptr &i1, +bool KCalendarCore::Incidences::summaryLessThan(const Incidence::Ptr &i1, const Incidence::Ptr &i2) { return QString::compare(i1->summary(), i2->summary(), Qt::CaseInsensitive) < 0; } -bool KCalCore::Incidences::summaryMoreThan(const Incidence::Ptr &i1, +bool KCalendarCore::Incidences::summaryMoreThan(const Incidence::Ptr &i1, const Incidence::Ptr &i2) { return QString::compare(i1->summary(), i2->summary(), Qt::CaseInsensitive) > 0; diff --git a/src/todo.h b/src/todo.h --- a/src/todo.h +++ b/src/todo.h @@ -34,7 +34,7 @@ #include "kcalcore_export.h" #include "incidence.h" -namespace KCalCore +namespace KCalendarCore { /** @@ -311,7 +311,7 @@ bool supportsGroupwareCommunication() const override; /** - Returns the Akonadi specific sub MIME type of a KCalCore::Todo. + Returns the Akonadi specific sub MIME type of a KCalendarCore::Todo. */ Q_REQUIRED_RESULT static QLatin1String todoMimeType(); @@ -356,12 +356,12 @@ //@endcond }; -} // namespace KCalCore +} // namespace KCalendarCore //@cond PRIVATE -Q_DECLARE_TYPEINFO(KCalCore::Todo::Ptr, Q_MOVABLE_TYPE); -Q_DECLARE_METATYPE(KCalCore::Todo::Ptr) -Q_DECLARE_METATYPE(KCalCore::Todo *) +Q_DECLARE_TYPEINFO(KCalendarCore::Todo::Ptr, Q_MOVABLE_TYPE); +Q_DECLARE_METATYPE(KCalendarCore::Todo::Ptr) +Q_DECLARE_METATYPE(KCalendarCore::Todo *) //@endcond #endif diff --git a/src/todo.cpp b/src/todo.cpp --- a/src/todo.cpp +++ b/src/todo.cpp @@ -40,24 +40,24 @@ #include -using namespace KCalCore; +using namespace KCalendarCore; /** Private class that helps to provide binary compatibility between releases. @internal */ //@cond PRIVATE -class Q_DECL_HIDDEN KCalCore::Todo::Private +class Q_DECL_HIDDEN KCalendarCore::Todo::Private { public: Private() {} - Private(const KCalCore::Todo::Private &other) + Private(const KCalendarCore::Todo::Private &other) { init(other); } - void init(const KCalCore::Todo::Private &other); + void init(const KCalendarCore::Todo::Private &other); QDateTime mDtDue; // to-do due date (if there is one) // ALSO the first occurrence of a recurring to-do @@ -71,7 +71,7 @@ bool recurTodo(Todo *todo); }; -void KCalCore::Todo::Private::init(const KCalCore::Todo::Private &other) +void KCalendarCore::Todo::Private::init(const KCalendarCore::Todo::Private &other) { mDtDue = other.mDtDue; mDtRecurrence = other.mDtRecurrence; @@ -82,19 +82,19 @@ //@endcond Todo::Todo() - : d(new KCalCore::Todo::Private) + : d(new KCalendarCore::Todo::Private) { } Todo::Todo(const Todo &other) : Incidence(other), - d(new KCalCore::Todo::Private(*other.d)) + d(new KCalendarCore::Todo::Private(*other.d)) { } Todo::Todo(const Incidence &other) : Incidence(other) - , d(new KCalCore::Todo::Private) + , d(new KCalendarCore::Todo::Private) { } diff --git a/src/utils.h b/src/utils.h --- a/src/utils.h +++ b/src/utils.h @@ -28,7 +28,7 @@ class QDataStream; -namespace KCalCore { +namespace KCalendarCore { /** * Helpers to retain backwards compatibility of binary serialization. diff --git a/src/utils.cpp b/src/utils.cpp --- a/src/utils.cpp +++ b/src/utils.cpp @@ -26,7 +26,7 @@ // To remain backwards compatible we need to (de)serialize QDateTime the way KDateTime // was (de)serialized -void KCalCore::serializeQDateTimeAsKDateTime(QDataStream &out, const QDateTime &dt) +void KCalendarCore::serializeQDateTimeAsKDateTime(QDataStream &out, const QDateTime &dt) { out << dt.date() << dt.time(); switch (dt.timeSpec()) { @@ -47,7 +47,7 @@ out << quint8(isDateOnly ? 0x01 : 0x00); } -void KCalCore::deserializeKDateTimeAsQDateTime(QDataStream &in, QDateTime &dt) +void KCalendarCore::deserializeKDateTimeAsQDateTime(QDataStream &in, QDateTime &dt) { QDate date; QTime time; @@ -79,12 +79,12 @@ in >> flags; } -void KCalCore::serializeQTimeZoneAsSpec(QDataStream &out, const QTimeZone &tz) +void KCalendarCore::serializeQTimeZoneAsSpec(QDataStream &out, const QTimeZone &tz) { out << static_cast('z') << (tz.isValid() ? QString::fromUtf8(tz.id()) : QString()); } -void KCalCore::deserializeSpecAsQTimeZone(QDataStream &in, QTimeZone &tz) +void KCalendarCore::deserializeSpecAsQTimeZone(QDataStream &in, QTimeZone &tz) { quint8 ts; in >> ts; @@ -111,15 +111,15 @@ } -void KCalCore::serializeQDateTimeList(QDataStream &out, const QList &list) +void KCalendarCore::serializeQDateTimeList(QDataStream &out, const QList &list) { out << list.size(); for (const auto &i : list) { serializeQDateTimeAsKDateTime(out, i); } } -void KCalCore::deserializeQDateTimeList(QDataStream &in, QList &list) +void KCalendarCore::deserializeQDateTimeList(QDataStream &in, QList &list) { int size; in >> size; diff --git a/src/vcalformat.h b/src/vcalformat.h --- a/src/vcalformat.h +++ b/src/vcalformat.h @@ -56,7 +56,7 @@ #define ICMethodProp "X-METHOD" #define ICRequestStatusProp "X-REQUEST-STATUS" -namespace KCalCore +namespace KCalendarCore { class Event; diff --git a/src/vcalformat.cpp b/src/vcalformat.cpp --- a/src/vcalformat.cpp +++ b/src/vcalformat.cpp @@ -53,7 +53,7 @@ #include // for .toHtmlEscaped() and Qt::mightBeRichText() #include -using namespace KCalCore; +using namespace KCalendarCore; /** Private class that helps to provide binary compatibility between releases. @@ -78,7 +78,7 @@ c.remove(c.indexOf(x)); } -class Q_DECL_HIDDEN KCalCore::VCalFormat::Private +class Q_DECL_HIDDEN KCalendarCore::VCalFormat::Private { public: Calendar::Ptr mCalendar; @@ -88,7 +88,7 @@ }; //@endcond -VCalFormat::VCalFormat() : d(new KCalCore::VCalFormat::Private) +VCalFormat::VCalFormat() : d(new KCalendarCore::VCalFormat::Private) { } diff --git a/src/visitor.h b/src/visitor.h --- a/src/visitor.h +++ b/src/visitor.h @@ -31,7 +31,7 @@ #include "todo.h" #include "freebusy.h" -namespace KCalCore +namespace KCalendarCore { /** diff --git a/src/visitor.cpp b/src/visitor.cpp --- a/src/visitor.cpp +++ b/src/visitor.cpp @@ -29,7 +29,7 @@ #include "journal.h" #include "freebusy.h" -using namespace KCalCore; +using namespace KCalendarCore; Visitor::Visitor() {