diff options
Diffstat (limited to 'src')
| -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; |