diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-01 15:52:36 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-17 10:54:20 (GMT) |
| commit | 73d10fd0813b19ad71e76419d78bf6e2dfd312d7 (patch) | |
| tree | e15159d68a495c75f3191f4445e870f0e391cabe /src/corelib/tools/qdatetime.h | |
| parent | 06ffa232f1920fa5aa857e644df08ef52b62a0b3 (diff) | |
| download | Qt-73d10fd0813b19ad71e76419d78bf6e2dfd312d7.zip Qt-73d10fd0813b19ad71e76419d78bf6e2dfd312d7.tar.gz Qt-73d10fd0813b19ad71e76419d78bf6e2dfd312d7.tar.bz2 | |
Add QDateTime::currentDateTimeUtc and QDateTime::currentMsecsSinceEpoch
Diffstat (limited to 'src/corelib/tools/qdatetime.h')
| -rw-r--r-- | src/corelib/tools/qdatetime.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/tools/qdatetime.h b/src/corelib/tools/qdatetime.h index cb7f5bd..ef5968e 100644 --- a/src/corelib/tools/qdatetime.h +++ b/src/corelib/tools/qdatetime.h @@ -204,7 +204,6 @@ private: friend class QDateTime; friend class QDateTimePrivate; - friend class QElapsedTimer; #ifndef QT_NO_DATASTREAM friend Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, const QTime &); friend Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QTime &); @@ -262,11 +261,13 @@ public: int utcOffset() const; static QDateTime currentDateTime(); + static QDateTime currentDateTimeUtc(); #ifndef QT_NO_DATESTRING static QDateTime fromString(const QString &s, Qt::DateFormat f = Qt::TextDate); static QDateTime fromString(const QString &s, const QString &format); #endif static QDateTime fromTime_t(uint secsSince1Jan1970UTC); + static qint64 currentMsecsSinceEpoch(); #ifdef QT3_SUPPORT inline QT3_SUPPORT void setTime_t(uint secsSince1Jan1970UTC, Qt::TimeSpec spec) { |