diff options
Diffstat (limited to 'qtinterface/tqt4/Qt')
| -rw-r--r-- | qtinterface/tqt4/Qt/qglobal.h | 4 | ||||
| -rw-r--r-- | qtinterface/tqt4/Qt/qpaintdevice.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/qtinterface/tqt4/Qt/qglobal.h b/qtinterface/tqt4/Qt/qglobal.h index dc0ef74..af3d17f 100644 --- a/qtinterface/tqt4/Qt/qglobal.h +++ b/qtinterface/tqt4/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) diff --git a/qtinterface/tqt4/Qt/qpaintdevice.h b/qtinterface/tqt4/Qt/qpaintdevice.h index 98157db..208e3d1 100644 --- a/qtinterface/tqt4/Qt/qpaintdevice.h +++ b/qtinterface/tqt4/Qt/qpaintdevice.h @@ -95,7 +95,7 @@ public: #elif defined(Q_WS_X11) virtual Qt::HANDLE handle() const; virtual Qt::HANDLE x11RenderHandle() const; - static GC qt_xget_temp_gc( int scrn, bool monochrome ); + static GC tqt_xget_temp_gc( int scrn, bool monochrome ); #elif defined(Q_WS_MAC) virtual Qt::HANDLE handle() const; #elif defined(Q_WS_QWS) |