added easy to use method to read Date with certain format

2 files changed, 19 insertions, 0 deletions

diff --git a/microkde/kdecore/klocale.cpp b/microkde/kdecore/klocale.cpp
index 17031c7..8b4513e 100644
--- a/microkde/kdecore/klocale.cpp
+++ b/microkde/kdecore/klocale.cpp
@@ -571,96 +571,113 @@ QTime KLocale::readTime(const QString &intstr, bool seconds, bool *ok) const
   if (ok) *ok = true;
   return QTime(hour, minute, second);
 
  error:
   if (ok) *ok = false;
   return QTime(-1, -1, -1); // return invalid date if it didn't work
   // This will be removed in the near future, since it gives a warning on stderr.
   // The presence of the bool* (since KDE-3.0) removes the need for an invalid QTime.
 }
 
 QDateTime KLocale::readDateTime(const QString &intstr, 
 				IntDateFormat intIntDateFormat, 
 				bool* ok) const
 {
   bool ok1, ok2;
 
   // AT the moment we can not read any other format then ISODate
   if ( intIntDateFormat != ISODate )
     {
       qDebug("KLocale::readDateTime, only ISODate is supported.");
       return QDateTime();
     }  
 
   int pos = intstr.find("T");
   QString date = intstr.left(pos);
   QString time = intstr.mid(pos+1);
 
   QString dformat = dateFormat(intIntDateFormat);
   QString tformat = timeFormat(intIntDateFormat);
 
   QDate m_date = readDate(date, dformat, &ok1);
   QTime m_time = readTime(time, tformat, &ok2);
 
   if (ok)
     {
       if ((ok1 == false) || (ok2 == false))
 	*ok = false;
       else
 	*ok = true;
     }
   QDateTime m_dt;
   m_dt.setDate(m_date);
   m_dt.setTime(m_time);
 
   qDebug("KLocale::readDateTime() transformed %s into %s (%s), %s (%s) : err1=%i, err2=%i", intstr.latin1(), date.latin1(), dformat.latin1(), time.latin1(), tformat.latin1(), ok1, ok2);
   return m_dt;
 }
 
+QDate KLocale::readDate(const QString &intstr, 
+				IntDateFormat intIntDateFormat, 
+				bool* ok) const
+{
+  bool ok1;
+
+  QString dformat = dateFormat(intIntDateFormat);
+
+  QDate m_date = readDate(intstr, dformat, &ok1);
+
+  if (ok)
+    *ok = ok1;
+
+  //qDebug("KLocale::readDate() transformed %s into %s (%s), %s (%s) : err1=%i, err2=%i", intstr.latin1(), date.latin1(), dformat.latin1(), time.latin1(), tformat.latin1(), ok1, ok2);
+  return m_date;
+}
+
 
 bool KLocale::use12Clock() const
 {
     return !mHourF24Format ;;
 }
 
 bool KLocale::weekStartsMonday() const
 {
     return mWeekStartsMonday;
 }
 
 int KLocale::weekStartDay() const
 {
     if ( mWeekStartsMonday )
         return 1;
     return 7;
 }
 
 QString KLocale::weekDayName(int i,bool shortName) const
 {
   if ( shortName )
     switch ( i )
       {
       case 1:  return i18n("Monday", "Mon");
       case 2:  return i18n("Tuesday", "Tue");
       case 3:  return i18n("Wednesday", "Wed");
       case 4:  return i18n("Thursday", "Thu");
       case 5:  return i18n("Friday", "Fri");
       case 6:  return i18n("Saturday", "Sat");
       case 7:  return i18n("Sunday", "Sun");
       }
   else
     switch ( i )
       {
       case 1:  return i18n("Monday");
       case 2:  return i18n("Tuesday");
       case 3:  return i18n("Wednesday");
       case 4:  return i18n("Thursday");
       case 5:  return i18n("Friday");
       case 6:  return i18n("Saturday");
       case 7:  return i18n("Sunday");
       }
 
   return QString::null;
 }
 
 QString KLocale::monthName(int i,bool shortName) const
 {
diff --git a/microkde/kdecore/klocale.h b/microkde/kdecore/klocale.h
index 949301a..5783530 100644
--- a/microkde/kdecore/klocale.h
+++ b/microkde/kdecore/klocale.h
@@ -8,96 +8,98 @@
 
 #ifndef I18N_NOOP
 #define I18N_NOOP(x) (x)
 #endif
 
 class KCalendarSystem;
 void setLocaleDict( QDict<QString> * dict );
 QString i18n(const char *text);
 QString i18n(const char *hint, const char *text);
 QString i18n(const char *text1, const char *textn, int num);
 
 // Qt3's uic generates i18n( "msg", "comment" ) calls which conflict
 // with our i18n method. we use uic -tr tr2i18n to redirect
 // to the right i18n() function
 inline QString tr2i18n(const char* message, const char* =0) {
   return i18n( message);
 }
 
 class KLocale
 {
   public:
     KLocale();
 
     QString formatNumber(double num, int precision = -1) const;
     QString formatNumber(const QString &numStr) const;
     double readNumber(const QString &numStr, bool * ok = 0) const;
     
     QString decimalSymbol() const;
     QString thousandsSeparator() const;
     QString positiveSign() const;
     QString negativeSign() const;
 
 
     QString translate( const char *index ) const;
     QString translate( const char *index, const char *fallback) const;
 
     enum IntDateFormat { Undefined=-1, Default=0, Format1=1, ISODate=2, Userdefined=3 };
     
     QString formatDate(const QDate &pDate, bool shortFormat = false, IntDateFormat intIntDateFormat = Undefined) const;
     QString formatTime(const QTime &pTime, bool includeSecs = false, IntDateFormat intIntDateFormat = Undefined) const;
     QString formatDateTime(const QDateTime &pDateTime, IntDateFormat intIntDateFormat = Undefined) const;
     QString formatDateTime(const QDateTime &pDateTime,
                            bool shortFormat,
                            bool includeSecs = false, IntDateFormat intIntDateFormat = Undefined) const;
 
     QDate readDate(const QString &str, bool* ok = 0) const;
     QDate readDate( const QString &intstr, const QString &fmt, bool* ok = 0) const;
     QTime readTime(const QString &str, bool* ok = 0) const;
+    QDate readDate(const QString &intstr, IntDateFormat intIntDateFormat, bool* ok) const;
+
     QDateTime readDateTime(const QString &intstr, IntDateFormat intIntDateFormat, bool* ok) const;
 
     bool use12Clock() const;
     bool weekStartsMonday() const;
     int weekStartDay() const;
     
     QString weekDayName(int,bool=false) const;
     QString monthName(int,bool=false) const;
 
     QString country() const;
 
     QString dateFormat(IntDateFormat intIntDateFormat = Undefined) const;
     QString dateFormatShort(IntDateFormat intIntDateFormat = Undefined) const;
     QString timeFormat(IntDateFormat intIntDateFormat = Undefined) const;
 
     void insertCatalogue ( const QString & );
 
     KCalendarSystem *calendar();
     void setHore24Format ( bool );
     void setWeekStartMonday( bool );
     void setIntDateFormat( IntDateFormat );
     void setIntTimeFormat( IntDateFormat );
     IntDateFormat getIntDateFormat( );
     IntDateFormat getIntTimeFormat( );
     void setLanguage( int );
     void setDateFormat( QString );
     void setDateFormatShort( QString );
 
   QString m_decimalSymbol;
   QString m_thousandsSeparator;
   QString m_currencySymbol;
   QString m_monetaryDecimalSymbol;
   QString m_monetaryThousandsSeparator;
   QString m_positiveSign;
   QString m_negativeSign;
 
     int timezoneOffset( QString );
     QStringList timeZoneList() const;
     void setDaylightSaving( bool, int , int );
     int localTimeOffset(const QDateTime &);
     void setTimezone( const QString &timeZone );
   private:
     QTime readTime(const QString &str, bool seconds, bool *ok) const;
     QDate readDate(const QString &str, bool shortFormat, bool *ok) const;
     KCalendarSystem *mCalendarSystem;
     bool mWeekStartsMonday;
     bool mHourF24Format;
     IntDateFormat mIntDateFormat;