Changeset 846 for trunk/src/corelib/tools/qdatetime.h

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/corelib/tools/qdatetime.h (modified) (5 diffs)

trunk/src/corelib/tools/qdatetime.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -231 +231 @@
     QTime time() const;
     Qt::TimeSpec timeSpec() const;
+
     uint toTime_t() const;
     void setDate(const QDate &date);
     void setTime(const QTime &time);
     void setTimeSpec(Qt::TimeSpec spec);
+
     void setTime_t(uint secsSince1Jan1970UTC);
 #ifndef QT_NO_DATESTRING
@@ -250 +252 @@
     int daysTo(const QDateTime &) const;
     int secsTo(const QDateTime &) const;
+
 
     bool operator==(const QDateTime &other) const;
@@ -262 +265 @@
 
     static QDateTime currentDateTime();
+
 #ifndef QT_NO_DATESTRING
     static QDateTime fromString(const QString &s, Qt::DateFormat f = Qt::TextDate);
@@ -267 +271 @@
 #endif
     static QDateTime fromTime_t(uint secsSince1Jan1970UTC);
+
+
 
 #ifdef QT3_SUPPORT