Changeset 561 for trunk/src/corelib/tools/qdatetime.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/corelib/tools/qdatetime.cpp (modified) (29 diffs)

trunk/src/corelib/tools/qdatetime.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -50 +50 @@
 #include "qdebug.h"
 #if defined(Q_OS_WIN32) || defined(Q_OS_WINCE)
-#include <windows.h>
+#include <windows.h>
 #endif
 #ifndef Q_WS_WIN
@@ -72 +72 @@
 #if defined(Q_WS_MAC)
 #include <private/qcore_mac_p.h>
+
+
+
+
 #endif
 
@@ -194 +198 @@
     \brief The QDate class provides date functions.
 
-    \ingroup time
-    \mainclass
 
     A QDate object contains a calendar date, i.e. year, month, and day
@@ -1131 +1133 @@
     GetLocalTime(&st);
     d.jd = julianDayFromDate(st.wYear, st.wMonth, st.wDay);
+
+
+
+
+
+
 #else
     // posix compliant system
@@ -1412 +1420 @@
     \brief The QTime class provides clock time functions.
 
-    \ingroup time
-    \mainclass
 
     A QTime object contains a clock time, i.e. the number of hours,
@@ -1828 +1834 @@
     ct.startTick = GetTickCount() % MSECS_PER_DAY;
 #endif
+
+
+
+
+
+
 #elif defined(Q_OS_UNIX) || (defined(Q_OS_OS2) && defined(Q_CC_GNU))
     // posix compliant system
@@ -1843 +1855 @@
     t = localtime(&ltime);
 #endif
+
 
     ct.mds = MSECS_PER_HOUR * t->tm_hour + MSECS_PER_MIN * t->tm_min + 1000 * t->tm_sec
@@ -1849 +1862 @@
     time_t ltime; // no millisecond resolution
     ::time(&ltime);
-    tm *t = 0;
-    t = localtime(&ltime);
+    const tm *const t = localtime(&ltime);
     ct.mds = MSECS_PER_HOUR * t->tm_hour + MSECS_PER_MIN * t->tm_min + 1000 * t->tm_sec;
 #endif
@@ -2076 +2088 @@
     \brief The QDateTime class provides date and time functions.
 
-    \ingroup time
-    \mainclass
 
     A QDateTime object contains a calendar date and a clock time (a
@@ -2201 +2211 @@
 */
 QDateTime::QDateTime()
-{
-    d = new QDateTimePrivate;
+    : d(new QDateTimePrivate)
+{
 }
 
@@ -2212 +2222 @@
 
 QDateTime::QDateTime(const QDate &date)
-{
-    d = new QDateTimePrivate;
+    : d(new QDateTimePrivate)
+{
     d->date = date;
     d->time = QTime(0, 0, 0);
@@ -2226 +2236 @@
 
 QDateTime::QDateTime(const QDate &date, const QTime &time, Qt::TimeSpec spec)
-{
-    d = new QDateTimePrivate;
+    : d(new QDateTimePrivate)
+{
     d->date = date;
     d->time = date.isValid() && !time.isValid() ? QTime(0, 0, 0) : time;
@@ -2238 +2248 @@
 
 QDateTime::QDateTime(const QDateTime &other)
-{
-    d = other.d;
-    d->ref.ref();
+    : d(other.d)
+{
 }
 
@@ -2248 +2257 @@
 QDateTime::~QDateTime()
 {
-    if (!d->ref.deref())
-        delete d;
 }
 
@@ -2259 +2266 @@
 QDateTime &QDateTime::operator=(const QDateTime &other)
 {
-    qAtomicAssign(d, other.d);
+    ;
     return *this;
 }
@@ -2505 +2512 @@
         buf += QString::number(d->date.day());
 #else
-        QString winstr;
-        QT_WA({
-            TCHAR out[255];
-            GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_ILDATE, out, 255);
-            winstr = QString::fromUtf16((ushort*)out);
-        } , {
-            char out[255];
-            GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_ILDATE, (char*)&out, 255);
-            winstr = QString::fromLocal8Bit(out);
-        });
+        wchar_t out[255];
+        GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_ILDATE, out, 255);
+        QString winstr = QString::fromWCharArray(out);
         switch (winstr.toInt()) {
         case 1:
@@ -2891 +2891 @@
             + st.wMilliseconds;
     return QDateTime(d, t);
+
+
 #else
 #if defined(Q_OS_UNIX) || (defined(Q_OS_OS2) && defined(Q_CC_GNU))
@@ -3300 +3302 @@
 void QDateTime::detach()
 {
-    qAtomicDetach(d);
+    );
 }
 
@@ -3718 +3720 @@
     res.tm_year = sysTime.wYear - 1900;
     brokenDown = &res;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 #elif !defined(QT_NO_THREAD) && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
     // use the reentrant version of localtime() where available
@@ -3763 +3786 @@
     localTM.tm_year = fakeDate.year() - 1900;
     localTM.tm_isdst = (int)isdst;
-#if defined(Q_OS_WINCE)
+#if defined(Q_OS_WINCE)
     time_t secsSince1Jan1970UTC = toTime_tHelper(fakeDate, time);
 #else
@@ -3788 +3811 @@
     res.tm_isdst = (int)isdst;
     brokenDown = &res;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 #elif !defined(QT_NO_THREAD) && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
     // use the reentrant version of gmtime() where available
@@ -3835 +3879 @@
 QDebug operator<<(QDebug dbg, const QDate &date)
 {
-    dbg.nospace() << "QDate(" << date.toString() << ")";
+    dbg.nospace() << "QDate(" << date.toString() << ;
     return dbg.space();
 }
@@ -3841 +3885 @@
 QDebug operator<<(QDebug dbg, const QTime &time)
 {
-    dbg.nospace() << "QTime(" << time.toString() << ")";
+    dbg.nospace() << "QTime(" << time.toString() << ;
     return dbg.space();
 }
@@ -3847 +3891 @@
 QDebug operator<<(QDebug dbg, const QDateTime &date)
 {
-    dbg.nospace() << "QDateTime(" << date.toString() << ")";
+    dbg.nospace() << "QDateTime(" << date.toString() << ;
     return dbg.space();
 }
@@ -4400 +4444 @@
         qWarning("QDateTimeParser::sectionMaxSize: Invalid section %s",
                  sectionName(s).toLatin1().constData());
+
+
+
+
+
+
+
     }
     return -1;
@@ -4690 +4741 @@
                 const FieldInfo fi = fieldInfo(index);
                 if ((fi & (Numeric|FixedWidth)) == (Numeric|FixedWidth)) {
-                    const QString newText = QString(QLatin1String("%1")).arg(num, sn.count, 10, QLatin1Char('0'));
+                    const QString newText = QString).arg(num, sn.count, 10, QLatin1Char('0'));
                     input.replace(pos, used, newText);
                     used = sn.count;