diff options
| -rw-r--r-- | qtinterface/interface_qt3/tqapplication.cpp | 12 | ||||
| -rw-r--r-- | qtinterface/interface_qt3/tqpaintdevice.cpp | 2 | ||||
| -rw-r--r-- | qtinterface/interface_tqt3/tqapplication.cpp | 12 | ||||
| -rw-r--r-- | qtinterface/interface_tqt3/tqpaintdevice.cpp | 2 | ||||
| -rw-r--r-- | qtinterface/qt4/Qt/q3header.h | 2 | ||||
| -rw-r--r-- | qtinterface/qt4/Qt/qglobal.h | 4 | ||||
| -rw-r--r-- | qtinterface/tqt.h.cmake | 70 | ||||
| -rw-r--r-- | qtinterface/tqt4/Qt/qglobal.h | 4 | ||||
| -rw-r--r-- | qtinterface/tqt4/Qt/qpaintdevice.h | 2 |
9 files changed, 55 insertions, 55 deletions
diff --git a/qtinterface/interface_qt3/tqapplication.cpp b/qtinterface/interface_qt3/tqapplication.cpp index 26a20d6..94da336 100644 --- a/qtinterface/interface_qt3/tqapplication.cpp +++ b/qtinterface/interface_qt3/tqapplication.cpp @@ -25,23 +25,23 @@ Boston, MA 02110-1301, USA. #include <X11/X.h> #ifdef USE_QT3 -extern Time qt_x_time; -extern Time qt_x_user_time; +extern Time tqt_x_time; +extern Time tqt_x_user_time; void set_tqt_x_time(unsigned long x) { - qt_x_time = x; + tqt_x_time = x; } unsigned long get_tqt_x_time(void) { - return qt_x_time; + return tqt_x_time; } void set_tqt_x_user_time(unsigned long x) { - qt_x_user_time = x; + tqt_x_user_time = x; } unsigned long get_tqt_x_user_time(void) { - return qt_x_user_time; + return tqt_x_user_time; } #endif diff --git a/qtinterface/interface_qt3/tqpaintdevice.cpp b/qtinterface/interface_qt3/tqpaintdevice.cpp index ae33f5c..d5806e1 100644 --- a/qtinterface/interface_qt3/tqpaintdevice.cpp +++ b/qtinterface/interface_qt3/tqpaintdevice.cpp @@ -95,7 +95,7 @@ static GC create_gc( int scrn, bool monochrome ) return gc; } -GC qt_xget_temp_gc( int scrn, bool monochrome ) // get temporary GC +GC tqt_xget_temp_gc( int scrn, bool monochrome ) // get temporary GC { int appScreenCount = QApplication::desktop()->numScreens(); if ( scrn < 0 || scrn >= appScreenCount ) { diff --git a/qtinterface/interface_tqt3/tqapplication.cpp b/qtinterface/interface_tqt3/tqapplication.cpp index d96d9fc..dbeef36 100644 --- a/qtinterface/interface_tqt3/tqapplication.cpp +++ b/qtinterface/interface_tqt3/tqapplication.cpp @@ -25,23 +25,23 @@ Boston, MA 02110-1301, USA. #include <X11/X.h> #ifdef USE_QT3 -extern Time qt_x_time; -extern Time qt_x_user_time; +extern Time tqt_x_time; +extern Time tqt_x_user_time; void set_tqt_x_time(unsigned long x) { - qt_x_time = x; + tqt_x_time = x; } unsigned long get_tqt_x_time(void) { - return qt_x_time; + return tqt_x_time; } void set_tqt_x_user_time(unsigned long x) { - qt_x_user_time = x; + tqt_x_user_time = x; } unsigned long get_tqt_x_user_time(void) { - return qt_x_user_time; + return tqt_x_user_time; } #endif diff --git a/qtinterface/interface_tqt3/tqpaintdevice.cpp b/qtinterface/interface_tqt3/tqpaintdevice.cpp index 7f3574a..103d845 100644 --- a/qtinterface/interface_tqt3/tqpaintdevice.cpp +++ b/qtinterface/interface_tqt3/tqpaintdevice.cpp @@ -95,7 +95,7 @@ static GC create_gc( int scrn, bool monochrome ) return gc; } -GC qt_xget_temp_gc( int scrn, bool monochrome ) // get temporary GC +GC tqt_xget_temp_gc( int scrn, bool monochrome ) // get temporary GC { int appScreenCount = QApplication::desktop()->numScreens(); if ( scrn < 0 || scrn >= appScreenCount ) { 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) diff --git a/qtinterface/tqt.h.cmake b/qtinterface/tqt.h.cmake index ef66dce..492429f 100644 --- a/qtinterface/tqt.h.cmake +++ b/qtinterface/tqt.h.cmake @@ -1025,37 +1025,37 @@ Boston, MA 02110-1301, USA. #define tqstrnicmp tqstrnicmp #define tqstricmp tqstricmp -#define tqt_get_application_thread_id qt_get_application_thread_id -#define tqt_x_user_time qt_x_user_time -#define tqt_xget_temp_gc qt_xget_temp_gc -#define tqt_has_xft qt_has_xft -#define tqt_modal_state qt_modal_state -#define tqt_check_pointer qt_check_pointer -#define tqt_preliminary_signal_spy qt_preliminary_signal_spy -#define tqt_wm_take_focus qt_wm_take_focus -#define tqt_global_mutexpool qt_global_mutexpool -#define tqt_xdisplay qt_xdisplay -#define tqt_resolve_symlinks qt_resolve_symlinks -#define tqt_qclipboard_bailout_hack qt_qclipboard_bailout_hack -#define tqt_x_time qt_x_time -#define tqt_wm_delete_window qt_wm_delete_window -#define tqt_qheader_label_return_null_strings qt_qheader_label_return_null_strings -#define tqt_xscreen qt_xscreen -#define tqt_setAccelAutoShortcuts qt_setAccelAutoShortcuts -#define tqt_sm_client_id qt_sm_client_id -#define tqt_set_table_clipper_enabled qt_set_table_clipper_enabled -#define tqt_hebrew_keyboard_hack qt_hebrew_keyboard_hack -#define tqt_use_native_dialogs qt_use_native_dialogs -#define tqt_generate_epsf qt_generate_epsf -#define tqt_xget_readonly_gc qt_xget_readonly_gc -#define tqt_use_xrender qt_use_xrender -#define tqt_set_x11_event_filter qt_set_x11_event_filter -#define tqt_xrootwin qt_xrootwin -#define tqt_wm_protocols qt_wm_protocols -#define tqt_ftp_filename_codec qt_ftp_filename_codec -#define tqt_window_role qt_window_role -#define tqt_tab_all_widgets qt_tab_all_widgets -#define tqt_wm_state qt_wm_state +#define tqt_get_application_thread_id tqt_get_application_thread_id +#define tqt_x_user_time tqt_x_user_time +#define tqt_xget_temp_gc tqt_xget_temp_gc +#define tqt_has_xft tqt_has_xft +#define tqt_modal_state tqt_modal_state +#define tqt_check_pointer tqt_check_pointer +#define tqt_preliminary_signal_spy tqt_preliminary_signal_spy +#define tqt_wm_take_focus tqt_wm_take_focus +#define tqt_global_mutexpool tqt_global_mutexpool +#define tqt_xdisplay tqt_xdisplay +#define tqt_resolve_symlinks tqt_resolve_symlinks +#define tqt_qclipboard_bailout_hack tqt_qclipboard_bailout_hack +#define tqt_x_time tqt_x_time +#define tqt_wm_delete_window tqt_wm_delete_window +#define tqt_qheader_label_return_null_strings tqt_qheader_label_return_null_strings +#define tqt_xscreen tqt_xscreen +#define tqt_setAccelAutoShortcuts tqt_setAccelAutoShortcuts +#define tqt_sm_client_id tqt_sm_client_id +#define tqt_set_table_clipper_enabled tqt_set_table_clipper_enabled +#define tqt_hebrew_keyboard_hack tqt_hebrew_keyboard_hack +#define tqt_use_native_dialogs tqt_use_native_dialogs +#define tqt_generate_epsf tqt_generate_epsf +#define tqt_xget_readonly_gc tqt_xget_readonly_gc +#define tqt_use_xrender tqt_use_xrender +#define tqt_set_x11_event_filter tqt_set_x11_event_filter +#define tqt_xrootwin tqt_xrootwin +#define tqt_wm_protocols tqt_wm_protocols +#define tqt_ftp_filename_codec tqt_ftp_filename_codec +#define tqt_window_role tqt_window_role +#define tqt_tab_all_widgets tqt_tab_all_widgets +#define tqt_wm_state tqt_wm_state #endif @@ -1544,10 +1544,10 @@ class QUObject; #define TQNoBrush Qt::NoBrush #define QMetaData QMetaMethod -#define qt_xdisplay QX11Info::display -#define qt_xrootwin QX11Info::appRootWindow -#define qt_xscreen QX11Info::appScreen -#define qt_xget_temp_gc QPaintDevice::qt_xget_temp_gc +#define tqt_xdisplay QX11Info::display +#define tqt_xrootwin QX11Info::appRootWindow +#define tqt_xscreen QX11Info::appScreen +#define tqt_xget_temp_gc QPaintDevice::tqt_xget_temp_gc #define TickSetting TickPosition #define ButtonState Qt::ButtonState #define qHeapSort tqHeapSort 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) |