diff options
Diffstat (limited to 'qtinterface/qt4')
| -rw-r--r-- | qtinterface/qt4/Qt/q3header.h | 2 | ||||
| -rw-r--r-- | qtinterface/qt4/Qt/qglobal.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/qtinterface/qt4/Qt/q3header.h b/qtinterface/qt4/Qt/q3header.h index 702b59b..1ddc7f4 100644 --- a/qtinterface/qt4/Qt/q3header.h +++ b/qtinterface/qt4/Qt/q3header.h @@ -214,7 +214,7 @@ inline Qt::Orientation Q3Header::orientation() const inline void Q3Header::setTracking(bool enable) { trackingIsOn = enable; } inline bool Q3Header::tracking() const { return trackingIsOn; } -extern Q_COMPAT_EXPORT bool qt_qheader_label_return_null_strings; // needed for professional edition +extern Q_COMPAT_EXPORT bool tqt_qheader_label_return_null_strings; // needed for professional edition #endif // QT_NO_HEADER diff --git a/qtinterface/qt4/Qt/qglobal.h b/qtinterface/qt4/Qt/qglobal.h index 7ab2b24..ce0db11 100644 --- a/qtinterface/qt4/Qt/qglobal.h +++ b/qtinterface/qt4/Qt/qglobal.h @@ -1677,7 +1677,7 @@ Q_CORE_EXPORT void qt_assert_x(const char *where, const char *what, const char * # endif #endif -Q_CORE_EXPORT void qt_check_pointer(const char *, int); +Q_CORE_EXPORT void tqt_check_pointer(const char *, int); #ifndef QT_NO_EXCEPTIONS Q_CORE_EXPORT void qBadAlloc(); @@ -1687,7 +1687,7 @@ Q_CORE_EXPORT void qBadAlloc(); # if defined(QT_NO_DEBUG) # define Q_CHECK_PTR(p) qt_noop(); # else -# define Q_CHECK_PTR(p) do {if(!(p))qt_check_pointer(__FILE__,__LINE__);} while (0) +# define Q_CHECK_PTR(p) do {if(!(p))tqt_check_pointer(__FILE__,__LINE__);} while (0) # endif #else # define Q_CHECK_PTR(p) do { if (!(p)) qBadAlloc(); } while (0) |