diff options
| author | Jon Severinsson <jon@severinsson.net> | 2012-10-09 15:15:53 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-10 08:45:22 +0200 |
| commit | 85c47eed6b6bfdacfb8e6438b6ef8a1185168675 (patch) | |
| tree | 9aae146045a3b5dd0b09c0a4f164a81289d61456 /src/corelib | |
| parent | 78dddc280235e3b298922189bfef8aca6f42d879 (diff) | |
Change QDateTime::addSecs() and QDateTime::secsTo() to use qint64.
addMSecs() / msecsTo() have always used qint64, and when QDate was changed
to use a 64-bit julian day, QDateTime::addDays() and QDateTime::daysTo() was
changed to use qint64 in order to support the full extended range, but
addSecs() and secsTo() seems to have been forgotten.
Change-Id: I3acc35ee2bcc9f353650eb42f97d428f706b2db6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/tools/qdatetime.cpp | 6 | ||||
| -rw-r--r-- | src/corelib/tools/qdatetime.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp index f9e970d861..0e3da78280 100644 --- a/src/corelib/tools/qdatetime.cpp +++ b/src/corelib/tools/qdatetime.cpp @@ -2756,9 +2756,9 @@ void QDateTimePrivate::addMSecs(QDate &utcDate, QTime &utcTime, qint64 msecs) \sa addMSecs(), secsTo(), addDays(), addMonths(), addYears() */ -QDateTime QDateTime::addSecs(int s) const +QDateTime QDateTime::addSecs(qint64 s) const { - return d->addMSecs(*this, qint64(s) * 1000); + return d->addMSecs(*this, s * 1000); } /*! @@ -2811,7 +2811,7 @@ qint64 QDateTime::daysTo(const QDateTime &other) const \sa addSecs(), daysTo(), QTime::secsTo() */ -int QDateTime::secsTo(const QDateTime &other) const +qint64 QDateTime::secsTo(const QDateTime &other) const { if (!isValid() || !other.isValid()) return 0; diff --git a/src/corelib/tools/qdatetime.h b/src/corelib/tools/qdatetime.h index 35c598fef7..ed7d8adb5f 100644 --- a/src/corelib/tools/qdatetime.h +++ b/src/corelib/tools/qdatetime.h @@ -232,13 +232,13 @@ public: QDateTime addDays(qint64 days) const; QDateTime addMonths(int months) const; QDateTime addYears(int years) const; - QDateTime addSecs(int secs) const; + QDateTime addSecs(qint64 secs) const; QDateTime addMSecs(qint64 msecs) const; QDateTime toTimeSpec(Qt::TimeSpec spec) const; inline QDateTime toLocalTime() const { return toTimeSpec(Qt::LocalTime); } inline QDateTime toUTC() const { return toTimeSpec(Qt::UTC); } qint64 daysTo(const QDateTime &) const; - int secsTo(const QDateTime &) const; + qint64 secsTo(const QDateTime &) const; qint64 msecsTo(const QDateTime &) const; bool operator==(const QDateTime &other) const; |