From 359640943bcf155faa9a067dde9e00a123276290 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 13 Feb 2012 17:43:39 -0600 Subject: Automated update from Qt3 --- src/tools/qglobal.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'src/tools/qglobal.cpp') diff --git a/src/tools/qglobal.cpp b/src/tools/qglobal.cpp index 2336fb0b1..baf6e6f69 100644 --- a/src/tools/qglobal.cpp +++ b/src/tools/qglobal.cpp @@ -58,14 +58,14 @@ Returns the TQt version number as a string, for example, "2.3.0" or "3.0.5". - The \c QT_VERSION define has the numeric value in the form: + The \c TQT_VERSION define has the numeric value in the form: 0xmmiibb (m = major, i = minor, b = bugfix). For example, TQt - 3.0.5's \c QT_VERSION is 0x030005. + 3.0.5's \c TQT_VERSION is 0x030005. */ const char *qVersion() { - return QT_VERSION_STR; + return TQT_VERSION_STR; } bool qSharedBuild() @@ -591,10 +591,10 @@ void qFatal( const char *msg, ... ) abort(); // trap; generates core dump #elif defined(Q_OS_TEMP) && defined(QT_DEBUG) TQString fstr; - fstr.sprintf( "%s:%s %s %s\n", __FILE__, __LINE__, QT_VERSION_STR, buf ); + fstr.sprintf( "%s:%s %s %s\n", __FILE__, __LINE__, TQT_VERSION_STR, buf ); OutputDebugString( fstr.ucs2() ); #elif defined(_CRT_ERROR) && defined(_DEBUG) - _CrtDbgReport( _CRT_ERROR, __FILE__, __LINE__, QT_VERSION_STR, buf ); + _CrtDbgReport( _CRT_ERROR, __FILE__, __LINE__, TQT_VERSION_STR, buf ); #else exit( 1 ); // goodbye cruel world #endif @@ -625,10 +625,10 @@ void fatal( const char *msg, ... ) abort(); // trap; generates core dump #elif defined(Q_OS_TEMP) && defined(QT_DEBUG) TQString fstr; - fstr.sprintf( "%s:%s %s %s\n", __FILE__, __LINE__, QT_VERSION_STR, buf ); + fstr.sprintf( "%s:%s %s %s\n", __FILE__, __LINE__, TQT_VERSION_STR, buf ); OutputDebugString( fstr.ucs2() ); #elif defined(_CRT_ERROR) && defined(_DEBUG) - _CrtDbgReport( _CRT_ERROR, __FILE__, __LINE__, QT_VERSION_STR, buf ); + _CrtDbgReport( _CRT_ERROR, __FILE__, __LINE__, TQT_VERSION_STR, buf ); #else exit( 1 ); // goodbye cruel world #endif @@ -729,7 +729,7 @@ void qSystemWarning( const char* msg, int code ) /*! - \fn void Q_CHECK_PTR( void *p ) + \fn void TQ_CHECK_PTR( void *p ) \relates TQApplication @@ -742,10 +742,10 @@ void qSystemWarning( const char* msg, int code ) \code int *a; - Q_CHECK_PTR( a = new int[80] ); // WRONG! + TQ_CHECK_PTR( a = new int[80] ); // WRONG! a = new (nothrow) int[80]; // Right - Q_CHECK_PTR( a ); + TQ_CHECK_PTR( a ); \endcode \sa qWarning(), \link debug.html Debugging\endlink @@ -753,11 +753,11 @@ void qSystemWarning( const char* msg, int code ) // -// The Q_CHECK_PTR macro calls this function to check if an allocation went ok. +// The TQ_CHECK_PTR macro calls this function to check if an allocation went ok. // -#if (QT_VERSION-0 >= 0x040000) +#if (TQT_VERSION-0 >= 0x040000) #if defined(Q_CC_GNU) -#warning "Change Q_CHECK_PTR to '{if ((p)==0) qt_check_pointer(__FILE__,__LINE__);}'" +#warning "Change TQ_CHECK_PTR to '{if ((p)==0) qt_check_pointer(__FILE__,__LINE__);}'" #warning "No need for qt_check_pointer() to return a value - make it void!" #endif #endif -- cgit v1.2.1