alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

I renamed the class into CalendarSystem and now the class derives from QObject

Browse Source 
also I added the Q_ENUMS
This commit is contained in:
Giorgos Tsiapaliwkas 2012-02-01 11:46:04 +02:00
parent 7269926c13
commit 2c77d052a3
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
declarativeimports/locale/calendarsystem.h
View File

@ -19,17 +19,16 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#ifndef KCALENDARSYSTEM_H #ifndef CALENDARSYSTEM_H
#define KCALENDARSYSTEM_H #define CALENDARSYSTEM_H
#include <kdecore_export.h>
#include "klocale.h" // needed for enums #include "klocale.h" // needed for enums
#include "kglobal.h" #include "kglobal.h"
#include <QtCore/QStringList> #include <QtCore/QStringList>
#include <QtCore/QDate> #include <QtCore/QDate>
class KCalendarSystemPrivate; class KCalendarSystem;
class KCalendarEra; class KCalendarEra;
/** /**
@ -37,8 +36,15 @@ class KCalendarEra;
* *
* Derived classes must be created through the create() static method * 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: public:
/** /**
@ -1283,9 +1289,10 @@ private:
KCalendarEra era(const QDate &eraDate) const; KCalendarEra era(const QDate &eraDate) const;
KCalendarEra era(const QString &eraName, int yearInEra) const; KCalendarEra era(const QString &eraName, int yearInEra) const;
Q_DISABLE_COPY(KCalendarSystem) //Q_DISABLE_COPY(KCalendarSystem)
KCalendarSystemPrivate * const d_ptr; // KDE5 make protected KCalendarSystem *m_calendarSystem;
Q_DECLARE_PRIVATE(KCalendarSystem) //FIXME What is Q_DECLARE_PRIVATE
//Q_DECLARE_PRIVATE(KCalendarSystem)
}; };
#endif #endif