diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-30 08:40:25 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-31 10:41:00 (GMT) |
| commit | 32f002486941c0cba246e08491e9a0800942cded (patch) | |
| tree | 1cae010bd4442ce344064c8ad896a4408d688519 /src/corelib/tools/qdatetime.h | |
| parent | 582cbf2d92addb34088830a3de97c08ddb147e30 (diff) | |
| download | Qt-32f002486941c0cba246e08491e9a0800942cded.zip Qt-32f002486941c0cba246e08491e9a0800942cded.tar.gz Qt-32f002486941c0cba246e08491e9a0800942cded.tar.bz2 | |
Rename the xxxMsecsSinceEpoch functions to xxxMSecsSinceEpoch.
Matches the addMSecs existing functions in QTime and QDateTime.
Reviewed-by: Marius Storm-Olsen
Diffstat (limited to 'src/corelib/tools/qdatetime.h')
| -rw-r--r-- | src/corelib/tools/qdatetime.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/tools/qdatetime.h b/src/corelib/tools/qdatetime.h index 248793b..f445f1c 100644 --- a/src/corelib/tools/qdatetime.h +++ b/src/corelib/tools/qdatetime.h @@ -230,12 +230,12 @@ public: QDate date() const; QTime time() const; Qt::TimeSpec timeSpec() const; - qint64 toMsecsSinceEpoch() const; + qint64 toMSecsSinceEpoch() const; uint toTime_t() const; void setDate(const QDate &date); void setTime(const QTime &time); void setTimeSpec(Qt::TimeSpec spec); - void setMsecsSinceEpoch(qint64 msecs); + void setMSecsSinceEpoch(qint64 msecs); void setTime_t(uint secsSince1Jan1970UTC); #ifndef QT_NO_DATESTRING QString toString(Qt::DateFormat f = Qt::TextDate) const; @@ -269,8 +269,8 @@ public: static QDateTime fromString(const QString &s, const QString &format); #endif static QDateTime fromTime_t(uint secsSince1Jan1970UTC); - static QDateTime fromMsecsSinceEpoch(qint64 msecs); - static qint64 currentMsecsSinceEpoch(); + static QDateTime fromMSecsSinceEpoch(qint64 msecs); + static qint64 currentMSecsSinceEpoch(); #ifdef QT3_SUPPORT inline QT3_SUPPORT void setTime_t(uint secsSince1Jan1970UTC, Qt::TimeSpec spec) { |