From 1aabc56ca5b178473a78720c88dd577792e98a34 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 6 Sep 2016 22:52:01 -0500 Subject: [PATCH] Automated update from TQt3 --- src/tools/qdatetime.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/tools/qdatetime.cpp b/src/tools/qdatetime.cpp index abf2dcd..6e96161 100644 --- a/src/tools/qdatetime.cpp +++ b/src/tools/qdatetime.cpp @@ -1997,7 +1997,7 @@ QDateTime::QDateTime( const QDate &date, const QTime &time ) \sa setTime_t() */ -uint QDateTime::toTime_t() const +time_t QDateTime::toTime_t() const { tm brokenDown; brokenDown.tm_sec = t.second(); @@ -2007,10 +2007,10 @@ uint QDateTime::toTime_t() const brokenDown.tm_mon = d.month() - 1; brokenDown.tm_year = d.year() - 1900; brokenDown.tm_isdst = -1; - int secsSince1Jan1970UTC = (int) mktime( &brokenDown ); + time_t secsSince1Jan1970UTC = mktime( &brokenDown ); if ( secsSince1Jan1970UTC < -1 ) secsSince1Jan1970UTC = -1; - return (uint) secsSince1Jan1970UTC; + return secsSince1Jan1970UTC; } /*! @@ -2020,7 +2020,7 @@ uint QDateTime::toTime_t() const based on the given UTC time. */ -void QDateTime::setTime_t( uint secsSince1Jan1970UTC ) +void QDateTime::setTime_t( time_t secsSince1Jan1970UTC ) { setTime_t( secsSince1Jan1970UTC, Qt::LocalTime ); } @@ -2037,9 +2037,9 @@ void QDateTime::setTime_t( uint secsSince1Jan1970UTC ) \sa toTime_t() */ -void QDateTime::setTime_t( uint secsSince1Jan1970UTC, Qt::TimeSpec ts ) +void QDateTime::setTime_t( time_t secsSince1Jan1970UTC, Qt::TimeSpec ts ) { - time_t tmp = (time_t) secsSince1Jan1970UTC; + time_t tmp = secsSince1Jan1970UTC; tm *brokenDown = 0; #if defined(Q_OS_UNIX) && defined(QT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS)