From 9a75b154bf0732aa3a501b6e31e566e06c5f8a31 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 2 Mar 2012 02:11:59 -0600 Subject: Undo prior accidental commit --- src/tools/qdatetime.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'src/tools/qdatetime.cpp') diff --git a/src/tools/qdatetime.cpp b/src/tools/qdatetime.cpp index ea8950a..d0c21dc 100644 --- a/src/tools/qdatetime.cpp +++ b/src/tools/qdatetime.cpp @@ -513,7 +513,7 @@ QString QDate::shortMonthName( int month ) { #if defined(QT_CHECK_RANGE) if ( month < 1 || month > 12 ) { - tqWarning( "QDate::shortMonthName: Parameter out ouf range" ); + qWarning( "QDate::shortMonthName: Parameter out ouf range" ); month = 1; } #endif @@ -559,7 +559,7 @@ QString QDate::longMonthName( int month ) { #if defined(QT_CHECK_RANGE) if ( month < 1 || month > 12 ) { - tqWarning( "QDate::longMonthName: Parameter out ouf range" ); + qWarning( "QDate::longMonthName: Parameter out ouf range" ); month = 1; } #endif @@ -613,7 +613,7 @@ QString QDate::shortDayName( int weekday ) { #if defined(QT_CHECK_RANGE) if ( weekday < 1 || weekday > 7 ) { - tqWarning( "QDate::shortDayName: Parameter out of range" ); + qWarning( "QDate::shortDayName: Parameter out of range" ); weekday = 1; } #endif @@ -661,7 +661,7 @@ QString QDate::longDayName( int weekday ) { #if defined(QT_CHECK_RANGE) if ( weekday < 1 || weekday > 7 ) { - tqWarning( "QDate::longDayName: Parameter out of range" ); + qWarning( "QDate::longDayName: Parameter out of range" ); weekday = 1; } #endif @@ -850,7 +850,7 @@ bool QDate::setYMD( int y, int m, int d ) return isValid(); if ( !isValid(y,m,d) ) { #if defined(QT_CHECK_RANGE) - tqWarning( "QDate::setYMD: Invalid date %04d-%02d-%02d", y, m, d ); + qWarning( "QDate::setYMD: Invalid date %04d-%02d-%02d", y, m, d ); #endif return FALSE; } @@ -1073,7 +1073,7 @@ QDate QDate::fromString( const QString& s, Qt::DateFormat f ) { if ( ( s.isEmpty() ) || ( f == Qt::LocalDate ) ) { #if defined(QT_CHECK_RANGE) - tqWarning( "QDate::fromString: Parameter out of range" ); + qWarning( "QDate::fromString: Parameter out of range" ); #endif QDate d; d.jd = 0; @@ -1122,7 +1122,7 @@ QDate QDate::fromString( const QString& s, Qt::DateFormat f ) } #if defined(QT_CHECK_RANGE) if ( month < 1 || month > 12 ) { - tqWarning( "QDate::fromString: Parameter out of range" ); + qWarning( "QDate::fromString: Parameter out of range" ); QDate d; d.jd = 0; return d; @@ -1493,7 +1493,7 @@ bool QTime::setHMS( int h, int m, int s, int ms ) { if ( !isValid(h,m,s,ms) ) { #if defined(QT_CHECK_RANGE) - tqWarning( "QTime::setHMS Invalid time %02d:%02d:%02d.%03d", h, m, s, + qWarning( "QTime::setHMS Invalid time %02d:%02d:%02d.%03d", h, m, s, ms ); #endif ds = MSECS_PER_DAY; // make this invalid @@ -1664,7 +1664,7 @@ QTime QTime::fromString( const QString& s, Qt::DateFormat f ) { if ( ( s.isEmpty() ) || ( f == Qt::LocalDate ) ) { #if defined(QT_CHECK_RANGE) - tqWarning( "QTime::fromString: Parameter out of range" ); + qWarning( "QTime::fromString: Parameter out of range" ); #endif QTime t; t.ds = MSECS_PER_DAY; @@ -1708,7 +1708,7 @@ bool QTime::currentTime( QTime *ct, Qt::TimeSpec ts ) { if ( !ct ) { #if defined(QT_CHECK_NULL) - tqWarning( "QTime::currentTime(QTime *): Null pointer not allowed" ); + qWarning( "QTime::currentTime(QTime *): Null pointer not allowed" ); #endif return FALSE; } @@ -1789,7 +1789,7 @@ bool QTime::isValid( int h, int m, int s, int ms ) QTime t; t.start(); some_lengthy_task(); - tqDebug( "Time elapsed: %d ms", t.elapsed() ); + qDebug( "Time elapsed: %d ms", t.elapsed() ); \endcode \sa restart(), elapsed(), currentTime() @@ -2320,7 +2320,7 @@ int QDateTime::daysTo( const QDateTime &dt ) const \code QDateTime dt = QDateTime::currentDateTime(); QDateTime xmas( QDate(dt.date().year(),12,24), QTime(17,00) ); - tqDebug( "There are %d seconds to Christmas", dt.secsTo(xmas) ); + qDebug( "There are %d seconds to Christmas", dt.secsTo(xmas) ); \endcode \sa addSecs(), daysTo(), QTime::secsTo() @@ -2449,7 +2449,7 @@ QDateTime QDateTime::fromString( const QString& s, Qt::DateFormat f ) { if ( ( s.isEmpty() ) || ( f == Qt::LocalDate ) ) { #if defined(QT_CHECK_RANGE) - tqWarning( "QDateTime::fromString: Parameter out of range" ); + qWarning( "QDateTime::fromString: Parameter out of range" ); #endif QDateTime dt; dt.d.jd = 0; @@ -2482,7 +2482,7 @@ QDateTime QDateTime::fromString( const QString& s, Qt::DateFormat f ) } #if defined(QT_CHECK_RANGE) if ( month < 1 || month > 12 ) { - tqWarning( "QDateTime::fromString: Parameter out of range" ); + qWarning( "QDateTime::fromString: Parameter out of range" ); QDateTime dt; dt.d.jd = 0; return dt; -- cgit v1.2.3