Changeset 8 for trunk/src/tools/qdatetime.cpp

Timestamp:

Nov 16, 2005, 8:36:46 PM (20 years ago)

Author:

dmik

Message:

Transferred Qt for OS/2 version 3.3.1-rc5 sources from the CVS

File:

• trunk/src/tools/qdatetime.cpp (modified) (9 diffs)

trunk/src/tools/qdatetime.cpp

@@ -51 +51 @@
 #endif
 
+#if defined(Q_OS_OS2)
+#include <unidef.h>
+#include <sys/timeb.h>
+#endif
+
 static const uint FIRST_DAY     = 2361222;      // Julian day for 1752-09-14
 static const int  FIRST_YEAR    = 1752;         // ### wrong for many countries
@@ -515 +520 @@
     }
 #endif
-#ifndef Q_WS_WIN
+#if defined(Q_OS_OS2)
+    UniChar buffer[256];
+    tm tt;
+    memset( &tt, 0, sizeof( tm ) );
+    tt.tm_mon = month - 1;
+    LocaleObject lo = qt_os2DefLocaleObj();
+    if (lo)
+        if ( UniStrftime( lo, buffer, sizeof( buffer ) / sizeof( UniChar ),
+                (UniChar *)L"%b", &tt )
+        )
+            return QString::fromUcs2( buffer );
+#elif !defined(Q_WS_WIN)
     char buffer[255];
     tm tt;
@@ -561 +577 @@
     }
 #endif
-#ifndef Q_WS_WIN
+#if defined(Q_OS_OS2)
+    UniChar buffer[256];
+    tm tt;
+    memset( &tt, 0, sizeof( tm ) );
+    tt.tm_mon = month - 1;
+    LocaleObject lo = qt_os2DefLocaleObj();
+    if (lo)
+        if ( UniStrftime( lo, buffer, sizeof( buffer ) / sizeof( UniChar ),
+                (UniChar *)L"%B", &tt )
+        )
+            return QString::fromUcs2( buffer );
+#elif !defined(Q_WS_WIN)
     char buffer[255];
     tm tt;
@@ -615 +642 @@
     }
 #endif
-#ifndef Q_WS_WIN
+#if defined(Q_OS_OS2)
+    UniChar buffer[256];
+    tm tt;
+    memset( &tt, 0, sizeof( tm ) );
+    tt.tm_wday = ( weekday == 7 ) ? 0 : weekday;
+    LocaleObject lo = qt_os2DefLocaleObj();
+    if (lo)
+        if ( UniStrftime( lo, buffer, sizeof( buffer ) / sizeof( UniChar ),
+                (UniChar *)L"%a", &tt )
+        )
+            return QString::fromUcs2( buffer );
+#elif !defined(Q_WS_WIN)
     char buffer[255];
     tm tt;
@@ -663 +701 @@
     }
 #endif
-#ifndef Q_WS_WIN
+#if defined(Q_OS_OS2)
+    UniChar buffer[256];
+    tm tt;
+    memset( &tt, 0, sizeof( tm ) );
+    tt.tm_wday = ( weekday == 7 ) ? 0 : weekday;
+    LocaleObject lo = qt_os2DefLocaleObj();
+    if (lo)
+        if ( UniStrftime( lo, buffer, sizeof( buffer ) / sizeof( UniChar ),
+                (UniChar *)L"%A", &tt )
+        )
+            return QString::fromUcs2( buffer );
+#elif !defined(Q_WS_WIN)
     char buffer[255];
     tm tt;
@@ -729 +778 @@
     case Qt::LocalDate:
         {
-#ifndef Q_WS_WIN
+#if defined(Q_OS_OS2)
+            tm tt;
+            memset( &tt, 0, sizeof( tm ) );
+            UniChar buf[256];
+            tt.tm_mday = day();
+            tt.tm_mon = month() - 1;
+            tt.tm_year = year() - 1900;
+
+            LocaleObject lo = qt_os2DefLocaleObj();
+            if (lo)
+                if ( UniStrftime( lo, buf, sizeof( buf ) / sizeof( UniChar ),
+                        (UniChar *)L"%x", &tt )
+                )
+                    return QString::fromUcs2( buf );
+#elif !defined(Q_WS_WIN)
             tm tt;
             memset( &tt, 0, sizeof( tm ) );
@@ -1395 +1458 @@
     case Qt::LocalDate:
         {
-#ifndef Q_WS_WIN
+#if defined(Q_OS_OS2)
+            tm tt;
+            memset( &tt, 0, sizeof( tm ) );
+            UniChar buf[256];
+            tt.tm_sec = second();
+            tt.tm_min = minute();
+            tt.tm_hour = hour();
+
+            LocaleObject lo = qt_os2DefLocaleObj();
+            if (lo)
+                if ( UniStrftime( lo, buf, sizeof( buf ) / sizeof( UniChar ),
+                        (UniChar *)L"%X", &tt )
+                )
+                    return QString::fromUcs2( buf );
+#elif !defined(Q_WS_WIN)
             tm tt;
             memset( &tt, 0, sizeof( tm ) );
@@ -1743 +1820 @@
     ct->ds = (uint)( MSECS_PER_HOUR * t->tm_hour + MSECS_PER_MIN * t->tm_min +
                      1000 * t->tm_sec + tv.tv_usec / 1000 );
+#elif defined(Q_OS_OS2)
+    timeb ltime;
+    ::ftime( &ltime );
+    tm *t;
+    if ( ts == Qt::LocalTime )
+        t = localtime( &ltime.time );
+    else
+        t = gmtime( &ltime.time );
+    ct->ds = (uint) ( MSECS_PER_HOUR * t->tm_hour + MSECS_PER_MIN * t->tm_min +
+                      1000 * t->tm_sec + ltime.millitm );
 #else
     time_t ltime; // no millisecond resolution
@@ -1748 +1835 @@
     tm *t;
     if ( ts == Qt::LocalTime )
-        localtime( &ltime );
+        t = localtime( &ltime );
     else
-        gmtime( &ltime );
+        t = gmtime( &ltime );
     ct->ds = (uint) ( MSECS_PER_HOUR * t->tm_hour + MSECS_PER_MIN * t->tm_min +
                       1000 * t->tm_sec );