[PATCH 03/23] kdatetime: Use public KCalendarSystem API

[Jon Severinsson]

---
 kdecore/date/kdatetime.cpp |   26 +++++++++++++-------------
 1 fil ändrad, 13 tillägg(+), 13 borttagningar(-)

diff --git a/kdecore/date/kdatetime.cpp b/kdecore/date/kdatetime.cpp
index dd93eca..f36a8b9 100644
--- a/kdecore/date/kdatetime.cpp
+++ b/kdecore/date/kdatetime.cpp
@@ -39,7 +39,7 @@
 #include <QtCore/QSharedData>
 
 #include <klocale.h>
-#include "kcalendarsystemqdate_p.h"
+#include "kcalendarsystem.h"
 #include <ksystemtimezone.h>
 #include <kdebug.h>
 
@@ -72,8 +72,8 @@ static const char longMonth[][10] = {
 
 static QDateTime fromStr(const QString& string, const QString& format, int& utcOffset,
                          QString& zoneName, QByteArray& zoneAbbrev, bool& dateOnly);
-static int matchDay(const QString &string, int &offset, KCalendarSystem*);
-static int matchMonth(const QString &string, int &offset, KCalendarSystem*);
+static int matchDay(const QString &string, int &offset, const KCalendarSystem*);
+static int matchMonth(const QString &string, int &offset, const KCalendarSystem*);
 static bool getUTCOffset(const QString &string, int &offset, bool colon, int &result);
 static int getAmPm(const QString &string, int &offset, KLocale*);
 static bool getNumber(const QString &string, int &offset, int mindigits, int maxdigits, int minval, int maxval, int &result);
@@ -1421,7 +1421,7 @@ QString KDateTime::toString(const QString &format) const
         return QString();
     enum { TZNone, UTCOffsetShort, UTCOffset, UTCOffsetColon, TZAbbrev, TZName };
     KLocale *locale = KLocale::global();
-    KCalendarSystemQDate calendar(locale);
+    QSharedPointer<const KCalendarSystem> calendar(KCalendarSystem::create(KLocale::QDateCalendar, locale));
     QString result;
     QString s;
     int num, numLength, zone;
@@ -1464,10 +1464,10 @@ QString KDateTime::toString(const QString &format) const
                     num = d->date().month();
                     break;
                 case 'B':     // month name, translated
-                    result += calendar.monthName(d->date().month(), 2000, KCalendarSystem::LongName);
+                    result += calendar->monthName(d->date().month(), 2000, KCalendarSystem::LongName);
                     break;
                 case 'b':     // month name, translated, short
-                    result += calendar.monthName(d->date().month(), 2000, KCalendarSystem::ShortName);
+                    result += calendar->monthName(d->date().month(), 2000, KCalendarSystem::ShortName);
                     break;
                 case 'd':     // day of month, 01 - 31
                     numLength = 2;
@@ -1476,10 +1476,10 @@ QString KDateTime::toString(const QString &format) const
                     num = d->date().day();
                     break;
                 case 'A':     // week day name, translated
-                    result += calendar.weekDayName(d->date().dayOfWeek(), KCalendarSystem::LongDayName);
+                    result += calendar->weekDayName(d->date().dayOfWeek(), KCalendarSystem::LongDayName);
                     break;
                 case 'a':     // week day name, translated, short
-                    result += calendar.weekDayName(d->date().dayOfWeek(), KCalendarSystem::ShortDayName);
+                    result += calendar->weekDayName(d->date().dayOfWeek(), KCalendarSystem::ShortDayName);
                     break;
                 case 'H':     // hour, 00 - 23
                     numLength = 2;
@@ -2435,7 +2435,7 @@ QDateTime fromStr(const QString& string, const QString& format, int& utcOffset,
 
     enum { TZNone, UTCOffset, UTCOffsetColon, TZAbbrev, TZName };
     KLocale *locale = KLocale::global();
-    KCalendarSystemQDate calendar(locale);
+    QSharedPointer<const KCalendarSystem> calendar(KCalendarSystem::create(KLocale::QDateCalendar, locale));
     int zone;
     int s = 0;
     int send = str.length();
@@ -2487,7 +2487,7 @@ QDateTime fromStr(const QString& string, const QString& format, int& utcOffset,
                 case 'B':
                 case 'b':     // month name, translated or English
                 {
-                    int m = matchMonth(str, s, &calendar);
+                    int m = matchMonth(str, s, calendar.data());
                     if (m <= 0  ||  (month != NO_NUMBER && month != m))
                         return QDateTime();
                     month = m;
@@ -2504,7 +2504,7 @@ QDateTime fromStr(const QString& string, const QString& format, int& utcOffset,
                 case 'A':
                 case 'a':     // week day name, translated or English
                 {
-                    int dow = matchDay(str, s, &calendar);
+                    int dow = matchDay(str, s, calendar.data());
                     if (dow <= 0  ||  (dayOfWeek != NO_NUMBER && dayOfWeek != dow))
                         return QDateTime();
                     dayOfWeek = dow;
@@ -2789,7 +2789,7 @@ QDateTime fromStr(const QString& string, const QString& format, int& utcOffset,
  * 'offset' is incremented by the length of the match.
  * Reply = day number (1 - 7), or <= 0 if no match.
  */
-int matchDay(const QString &string, int &offset, KCalendarSystem *calendar)
+int matchDay(const QString &string, int &offset, const KCalendarSystem *calendar)
 {
     int dayOfWeek;
     QString part = string.mid(offset);
@@ -2830,7 +2830,7 @@ int matchDay(const QString &string, int &offset, KCalendarSystem *calendar)
  * 'offset' is incremented by the length of the match.
  * Reply = month number (1 - 12), or <= 0 if no match.
  */
-int matchMonth(const QString &string, int &offset, KCalendarSystem *calendar)
+int matchMonth(const QString &string, int &offset, const KCalendarSystem *calendar)
 {
     int month;
     QString part = string.mid(offset);
-- 
1.7.10.4