Use time_t for UNIX timestamps

WARNING: This breaks the ABI!
pull/1/head
Timothy Pearson 8 years ago
parent c56533c917
commit 0b1b8701d9

@ -1997,7 +1997,7 @@ TQDateTime::TQDateTime( const TQDate &date, const TQTime &time )
\sa setTime_t() \sa setTime_t()
*/ */
uint TQDateTime::toTime_t() const time_t TQDateTime::toTime_t() const
{ {
tm brokenDown; tm brokenDown;
brokenDown.tm_sec = t.second(); brokenDown.tm_sec = t.second();
@ -2007,10 +2007,10 @@ uint TQDateTime::toTime_t() const
brokenDown.tm_mon = d.month() - 1; brokenDown.tm_mon = d.month() - 1;
brokenDown.tm_year = d.year() - 1900; brokenDown.tm_year = d.year() - 1900;
brokenDown.tm_isdst = -1; brokenDown.tm_isdst = -1;
int secsSince1Jan1970UTC = (int) mktime( &brokenDown ); time_t secsSince1Jan1970UTC = mktime( &brokenDown );
if ( secsSince1Jan1970UTC < -1 ) if ( secsSince1Jan1970UTC < -1 )
secsSince1Jan1970UTC = -1; secsSince1Jan1970UTC = -1;
return (uint) secsSince1Jan1970UTC; return secsSince1Jan1970UTC;
} }
/*! /*!
@ -2020,7 +2020,7 @@ uint TQDateTime::toTime_t() const
based on the given UTC time. based on the given UTC time.
*/ */
void TQDateTime::setTime_t( uint secsSince1Jan1970UTC ) void TQDateTime::setTime_t( time_t secsSince1Jan1970UTC )
{ {
setTime_t( secsSince1Jan1970UTC, TQt::LocalTime ); setTime_t( secsSince1Jan1970UTC, TQt::LocalTime );
} }
@ -2037,9 +2037,9 @@ void TQDateTime::setTime_t( uint secsSince1Jan1970UTC )
\sa toTime_t() \sa toTime_t()
*/ */
void TQDateTime::setTime_t( uint secsSince1Jan1970UTC, TQt::TimeSpec ts ) void TQDateTime::setTime_t( time_t secsSince1Jan1970UTC, TQt::TimeSpec ts )
{ {
time_t tmp = (time_t) secsSince1Jan1970UTC; time_t tmp = secsSince1Jan1970UTC;
tm *brokenDown = 0; tm *brokenDown = 0;
#if defined(Q_OS_UNIX) && defined(QT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) #if defined(Q_OS_UNIX) && defined(QT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS)

Loading…
Cancel
Save