1 files changed, 28 insertions, 4 deletions

diff --git a/microkde/kdecore/klocale.cpp b/microkde/kdecore/klocale.cpp
index 4960b9a..7bd8a70 100644
--- a/microkde/kdecore/klocale.cpp
+++ b/microkde/kdecore/klocale.cpp
@@ -285,104 +285,112 @@ QString KLocale::formatDate(const QDate &pDate, bool shortFormat, IntDateFormat
             case 'y':
               put_it_in( buffer, index, pDate.year() % 100 );
               break;
             case 'n':
               number = pDate.month();
             case 'e':
               // to share the code
               if ( rst.at( format_index ).unicode() == 'e' )
                 number = pDate.day();
               if ( number / 10 )
                 buffer[index++] = number / 10 + '0';
               buffer[index++] = number % 10 + '0';
               break;
             case 'm':
               put_it_in( buffer, index, pDate.month() );
               break;
             case 'b':
               put_it_in( buffer, index, monthName(pDate.month(), true) );
               break;
             case 'B':
               put_it_in( buffer, index, monthName(pDate.month(), false) );
               break;
             case 'd':
               put_it_in( buffer, index, pDate.day() );
               break;
             case 'a':
               put_it_in( buffer, index, weekDayName(pDate.dayOfWeek(), true) );
               break;
             case 'A':
               put_it_in( buffer, index, weekDayName(pDate.dayOfWeek(), false) );
               break;
             default:
               buffer[index++] = rst.at( format_index );
               break;
             }
           escape = false;
         }
     }
   QString ret( buffer, index );
   delete [] buffer;
   return ret;
 }
 
 QString KLocale::formatDateTime(const QDateTime &pDateTime,
                                 bool shortFormat,
                                 bool includeSeconds,
                                 IntDateFormat intIntDateFormat) const
 {
-  return QString( "%1 %2")
-    .arg( formatDate( pDateTime.date(), shortFormat, intIntDateFormat ) )
-    .arg( formatTime( pDateTime.time(), includeSeconds , intIntDateFormat ) );
+  QString format("%1 %2");
+
+  if ( intIntDateFormat == Default )
+    format = "%1 %2";
+  else if ( intIntDateFormat == Format1 )
+    format = "%1 %2";
+  else  if ( intIntDateFormat == ISODate )
+    format = "%1T%2";
+
+  return format.arg(formatDate( pDateTime.date(), shortFormat, intIntDateFormat ))
+               .arg(formatTime( pDateTime.time(), includeSeconds , intIntDateFormat ));
 }
 
 QString KLocale::formatDateTime(const QDateTime &pDateTime, IntDateFormat intIntDateFormat) const
 {
-  return formatDateTime(pDateTime, true, intIntDateFormat);
+  return formatDateTime(pDateTime, true, true, intIntDateFormat);
 }
 
 QDate KLocale::readDate(const QString &intstr, bool* ok) const
 {
   QDate date;
   date = readDate(intstr, true, ok);
   if (date.isValid()) return date;
   return readDate(intstr, false, ok);
 }
 
 QDate KLocale::readDate(const QString &intstr, bool shortFormat, bool* ok) const
 {
   QString fmt = (shortFormat ? dateFormatShort() : dateFormat()).simplifyWhiteSpace();
   return readDate( intstr, fmt, ok );
 }
 
 QDate KLocale::readDate(const QString &intstr, const QString &fmt, bool* ok) const
 {
   //kdDebug(173) << "KLocale::readDate intstr=" << intstr << " fmt=" << fmt << endl;
   QString str = intstr.simplifyWhiteSpace().lower();
   int day = -1, month = -1;
   // allow the year to be omitted if not in the format
   int year = QDate::currentDate().year();
   uint strpos = 0;
   uint fmtpos = 0;
 
   while (fmt.length() > fmtpos || str.length() > strpos)
     {
       if ( !(fmt.length() > fmtpos && str.length() > strpos) )
         goto error;
 
       QChar c = fmt.at(fmtpos++);
 
       if (c != '%') {
         if (c.isSpace())
           strpos++;
         else if (c != str.at(strpos++))
           goto error;
         continue;
       }
 
       // remove space at the begining
       if (str.length() > strpos && str.at(strpos).isSpace())
         strpos++;
 
       c = fmt.at(fmtpos++);
       switch (c)
       {
@@ -525,96 +533,112 @@ QTime KLocale::readTime(const QString &intstr, bool seconds, bool *ok) const
         case 'H':
           g_12h = false;
           hour = readInt(str, strpos);
           if (hour < 0 || hour > 23)
             goto error;
 
           break;
 
         case 'l':
         case 'I':
           g_12h = true;
           hour = readInt(str, strpos);
           if (hour < 1 || hour > 12)
             goto error;
 
           break;
 
         case 'M':
           minute = readInt(str, strpos);
           if (minute < 0 || minute > 59)
             goto error;
 
           break;
 
         case 'S':
           second = readInt(str, strpos);
           if (second < 0 || second > 59)
             goto error;
 
           break;
         }
     }
   if (g_12h)
     {
       hour %= 12;
       if (pm) hour += 12;
     }
 
   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, 
+                                bool shortFormat,
+                                bool includeSeconds,
+                                IntDateFormat intIntDateFormat, 
+                                bool* ok) const
+{
+  bool ok1, ok2;
+
+  QDate m_date = readDate(date, &ok1);
+                    QTime m_time = KGlobal::locale()->readTime(time, &ok2);
+                    if ((ok1 == false) || (ok2 == false))
+                      qDebug("Serializer::extractMeta invalid date or time !!!!!!!!!!!!!");
+
+}
+
+
 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
 {
   if ( shortName )