From cc54b44fa20cbe7accefeaa0ff08534440c4eae6 Mon Sep 17 00:00:00 2001 From: Giorgos Tsiapaliwkas Date: Sat, 24 Mar 2012 19:36:59 +0200 Subject: [PATCH] Fix the includes in CalendarSystem --- declarativeimports/locale/calendarsystem.cpp | 7 ++++--- declarativeimports/locale/calendarsystem.h | 7 +++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/declarativeimports/locale/calendarsystem.cpp b/declarativeimports/locale/calendarsystem.cpp index 1fbfb52ad..7ae42ad7f 100644 --- a/declarativeimports/locale/calendarsystem.cpp +++ b/declarativeimports/locale/calendarsystem.cpp @@ -17,13 +17,14 @@ Boston, MA 02110-1301, USA. */ +//own #include "calendarsystem.h" -#include "kdebug.h" -#include "kconfiggroup.h" +//KDE #include -#include #include + +//Qt #include CalendarSystem::CalendarSystem(QObject* parent) diff --git a/declarativeimports/locale/calendarsystem.h b/declarativeimports/locale/calendarsystem.h index 1b12cd6eb..ea2883c49 100644 --- a/declarativeimports/locale/calendarsystem.h +++ b/declarativeimports/locale/calendarsystem.h @@ -21,14 +21,13 @@ #ifndef CALENDARSYSTEM_H #define CALENDARSYSTEM_H +//own #include "locale.h" // needed for enums -#include "kglobal.h" -#include +//Qt #include class KCalendarSystem; -class KCalendarEra; /** * CalendarSystem abstract base class, provides support for local Calendar Systems in KDE @@ -49,7 +48,7 @@ Q_ENUMS(DateTimeComponent) Q_ENUMS(DateTimeComponentFormat) //properties -Q_PROPERTY(QList calendarSystemsList READ calendarSystemsList) +Q_PROPERTY(QList calendarSystemsList READ calendarSystemsList) //read-only Q_PROPERTY(Locale::CalendarSystem calendarSystem READ calendarSystem NOTIFY calendarSystemChanged)//read-only Q_PROPERTY(QString calendarLabel READ calendarLabel NOTIFY calendarLabelChanged)//read-only Q_PROPERTY(QDate epoch READ epoch NOTIFY epochChanged)//read-only