From 2c77d052a32b315048c26e495c3c8f22ecc403f5 Mon Sep 17 00:00:00 2001 From: Giorgos Tsiapaliwkas Date: Wed, 1 Feb 2012 11:46:04 +0200 Subject: [PATCH] I renamed the class into CalendarSystem and now the class derives from QObject also I added the Q_ENUMS --- declarativeimports/locale/calendarsystem.h | 23 ++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/declarativeimports/locale/calendarsystem.h b/declarativeimports/locale/calendarsystem.h index bae9073a5..2c4571784 100644 --- a/declarativeimports/locale/calendarsystem.h +++ b/declarativeimports/locale/calendarsystem.h @@ -19,17 +19,16 @@ Boston, MA 02110-1301, USA. */ -#ifndef KCALENDARSYSTEM_H -#define KCALENDARSYSTEM_H +#ifndef CALENDARSYSTEM_H +#define CALENDARSYSTEM_H -#include #include "klocale.h" // needed for enums #include "kglobal.h" #include #include -class KCalendarSystemPrivate; +class KCalendarSystem; class KCalendarEra; /** @@ -37,8 +36,15 @@ class KCalendarEra; * * Derived classes must be created through the create() static method */ -class KDECORE_EXPORT KCalendarSystem +class CalendarSystem : public QObject { +Q_OBJECT + +//enums +Q_ENUMS(StringFormat) +Q_ENUMS(MonthNameFormat) +Q_ENUMS(WeekDayNameFormat) + public: /** @@ -1283,9 +1289,10 @@ private: KCalendarEra era(const QDate &eraDate) const; KCalendarEra era(const QString &eraName, int yearInEra) const; - Q_DISABLE_COPY(KCalendarSystem) - KCalendarSystemPrivate * const d_ptr; // KDE5 make protected - Q_DECLARE_PRIVATE(KCalendarSystem) + //Q_DISABLE_COPY(KCalendarSystem) + KCalendarSystem *m_calendarSystem; + //FIXME What is Q_DECLARE_PRIVATE + //Q_DECLARE_PRIVATE(KCalendarSystem) }; #endif