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/qglobal.h | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'src/tools/qglobal.h') diff --git a/src/tools/qglobal.h b/src/tools/qglobal.h index a0ef13c..44e6bbf 100644 --- a/src/tools/qglobal.h +++ b/src/tools/qglobal.h @@ -912,9 +912,9 @@ extern Q_EXPORT bool qt_winunicode; // System information // -Q_EXPORT const char *tqVersion(); -Q_EXPORT bool tqSysInfo( int *wordSize, bool *bigEndian ); -Q_EXPORT bool tqSharedBuild(); +Q_EXPORT const char *qVersion(); +Q_EXPORT bool qSysInfo( int *wordSize, bool *bigEndian ); +Q_EXPORT bool qSharedBuild(); #if defined(Q_OS_MAC) int qMacVersion(); #elif defined(Q_WS_WIN) @@ -973,25 +973,25 @@ Q_EXPORT int qWinVersion(); #endif -Q_EXPORT void tqDebug( const char *, ... ) // print debug message +Q_EXPORT void qDebug( const char *, ... ) // print debug message #if defined(Q_CC_GNU) && !defined(__INSURE__) __attribute__ ((format (printf, 1, 2))) #endif ; -Q_EXPORT void tqWarning( const char *, ... ) // print warning message +Q_EXPORT void qWarning( const char *, ... ) // print warning message #if defined(Q_CC_GNU) && !defined(__INSURE__) __attribute__ ((format (printf, 1, 2))) #endif ; -Q_EXPORT void tqFatal( const char *, ... ) // print fatal message and exit +Q_EXPORT void qFatal( const char *, ... ) // print fatal message and exit #if defined(Q_CC_GNU) __attribute__ ((format (printf, 1, 2))) #endif ; -Q_EXPORT void tqSystemWarning( const char *, int code = -1 ); +Q_EXPORT void qSystemWarning( const char *, int code = -1 ); #if !defined(QT_CLEAN_NAMESPACE) // compatibility with Qt 1 @@ -1019,9 +1019,9 @@ Q_EXPORT void fatal( const char *, ... ) // print fatal message and exit #if !defined(Q_ASSERT) # if defined(QT_CHECK_STATE) # if defined(QT_FATAL_ASSERT) -# define Q_ASSERT(x) ((x) ? (void)0 : tqFatal("ASSERT: \"%s\" in %s (%d)",#x,__FILE__,__LINE__)) +# define Q_ASSERT(x) ((x) ? (void)0 : qFatal("ASSERT: \"%s\" in %s (%d)",#x,__FILE__,__LINE__)) # else -# define Q_ASSERT(x) ((x) ? (void)0 : tqWarning("ASSERT: \"%s\" in %s (%d)",#x,__FILE__,__LINE__)) +# define Q_ASSERT(x) ((x) ? (void)0 : qWarning("ASSERT: \"%s\" in %s (%d)",#x,__FILE__,__LINE__)) # endif # else # define Q_ASSERT(x) @@ -1060,27 +1060,27 @@ Q_EXPORT QtMsgHandler qInstallMsgHandler( QtMsgHandler ); typedef QtMsgHandler msg_handler; #endif // QT_NO_COMPAT -Q_EXPORT void tqSuppressObsoleteWarnings( bool = TRUE ); +Q_EXPORT void qSuppressObsoleteWarnings( bool = TRUE ); -Q_EXPORT void tqObsolete( const char *obj, const char *oldfunc, +Q_EXPORT void qObsolete( const char *obj, const char *oldfunc, const char *newfunc ); -Q_EXPORT void tqObsolete( const char *obj, const char *oldfunc ); -Q_EXPORT void tqObsolete( const char *message ); +Q_EXPORT void qObsolete( const char *obj, const char *oldfunc ); +Q_EXPORT void qObsolete( const char *message ); // // Install paths from configure // -Q_EXPORT const char *tqInstallPath(); -Q_EXPORT const char *tqInstallPathDocs(); -Q_EXPORT const char *tqInstallPathHeaders(); -Q_EXPORT const char *tqInstallPathLibs(); -Q_EXPORT const char *tqInstallPathBins(); -Q_EXPORT const char *tqInstallPathPlugins(); -Q_EXPORT const char *tqInstallPathData(); -Q_EXPORT const char *tqInstallPathTranslations(); -Q_EXPORT const char *tqInstallPathSysconf(); +Q_EXPORT const char *qInstallPath(); +Q_EXPORT const char *qInstallPathDocs(); +Q_EXPORT const char *qInstallPathHeaders(); +Q_EXPORT const char *qInstallPathLibs(); +Q_EXPORT const char *qInstallPathBins(); +Q_EXPORT const char *qInstallPathPlugins(); +Q_EXPORT const char *qInstallPathData(); +Q_EXPORT const char *qInstallPathTranslations(); +Q_EXPORT const char *qInstallPathSysconf(); #endif /* __cplusplus */ @@ -1095,7 +1095,7 @@ Q_EXPORT const char *tqInstallPathSysconf(); #ifdef Q_FULL_TEMPLATE_INSTANTIATION # define Q_DUMMY_COMPARISON_OPERATOR(C) \ bool operator==( const C& ) const { \ - tqWarning( #C"::operator==( const "#C"& ) got called." ); \ + qWarning( #C"::operator==( const "#C"& ) got called." ); \ return FALSE; \ } #else -- cgit v1.2.3