diff --git a/declarativeimports/locale/locale.cpp b/declarativeimports/locale/locale.cpp index d26347988..daf8990d2 100644 --- a/declarativeimports/locale/locale.cpp +++ b/declarativeimports/locale/locale.cpp @@ -329,13 +329,6 @@ QStringList Locale::currencyCodeList() const return m_locale->currencyCodeList(); } -/* Just copy in for now to keep diff clean, remove later -QString Locale::formatDateTime(const Locale *locale, const QDateTime &dateTime, Locale::DateFormat format, - bool includeSeconds, int daysTo, int secsTo) -{ -} -*/ - QString Locale::formatDateTime(const QDateTime &dateTime, Locale::DateFormat format, bool includeSeconds) const { return m_locale->formatDateTime(dateTime, (KLocale::DateFormat)format, (KLocale::DateFormat)includeSeconds); diff --git a/declarativeimports/locale/locale.h b/declarativeimports/locale/locale.h index a17b10c57..21876a00a 100644 --- a/declarativeimports/locale/locale.h +++ b/declarativeimports/locale/locale.h @@ -21,19 +21,14 @@ #define LOCALE_H #include -#include #include class QString; -class QStringList; //TODO will the QStringList invokable methods work in QML? -class QTextCodec; class QDate; class QTime; class QDateTime; -class KCalendarSystem;//TODO make it calendarSystem??? - /** * \file klocale.h */ @@ -902,7 +897,6 @@ public: * * @return the current calendar system instance */ - //const KCalendarSystem * calendar() const; /** *