Undo prior accidental commit

1 files changed, 63 insertions, 63 deletions

diff --git a/qtinterface/tqt.h.cmake b/qtinterface/tqt.h.cmake
index 492429f..c56998b 100644
--- a/qtinterface/tqt.h.cmake
+++ b/qtinterface/tqt.h.cmake
@@ -954,8 +954,8 @@ Boston, MA 02110-1301, USA.
 
 #endif
 
-#define tqSystemWarning	tqSystemWarning
-#define tqSuppressObsoleteWarnings	tqSuppressObsoleteWarnings
+#define tqSystemWarning	qSystemWarning
+#define tqSuppressObsoleteWarnings	qSuppressObsoleteWarnings
 
 #define tqmoc	moc
 #define TQMOC	MOC
@@ -1000,62 +1000,62 @@ Boston, MA 02110-1301, USA.
 
 #define tqApp	qApp
 
-#define tqAddPostRoutine tqAddPostRoutine
-#define tqWarning tqWarning
-#define tqSharedBuild tqSharedBuild
-#define tqNetworkProtocolRegister tqNetworkProtocolRegister
-#define tqDebug tqDebug
-#define tqCompress tqCompress
-#define tqFatal tqFatal
-#define tqSqlDriverExtDict tqSqlDriverExtDict
-#define tqSqlOpenExtDict tqSqlOpenExtDict
-#define tqInitNetworkProtocols tqInitNetworkProtocols
-#define tqSuppressObsoleteWarnings tqSuppressObsoleteWarnings
-#define tqChecksum tqChecksum
-#define tqRemovePostRoutine tqRemovePostRoutine
-#define tqInstallPath tqInstallPath
-#define tqObsolete tqObsolete
-#define tqVersion tqVersion
-#define tqSystemWarning tqSystemWarning
-#define tqSysInfo tqSysInfo
-
-#define tqmemmove tqmemmove
-#define tqstrncpy tqstrncpy
-#define tqstrdup tqstrdup
-#define tqstrnicmp tqstrnicmp
-#define tqstricmp tqstricmp
-
-#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
+#define tqAddPostRoutine qAddPostRoutine
+#define tqWarning qWarning
+#define tqSharedBuild qSharedBuild
+#define tqNetworkProtocolRegister qNetworkProtocolRegister
+#define tqDebug qDebug
+#define tqCompress qCompress
+#define tqFatal qFatal
+#define tqSqlDriverExtDict qSqlDriverExtDict
+#define tqSqlOpenExtDict qSqlOpenExtDict
+#define tqInitNetworkProtocols qInitNetworkProtocols
+#define tqSuppressObsoleteWarnings qSuppressObsoleteWarnings
+#define tqChecksum qChecksum
+#define tqRemovePostRoutine qRemovePostRoutine
+#define tqInstallPath qInstallPath
+#define tqObsolete qObsolete
+#define tqVersion qVersion
+#define tqSystemWarning qSystemWarning
+#define tqSysInfo qSysInfo
+
+#define tqmemmove qmemmove
+#define tqstrncpy qstrncpy
+#define tqstrdup qstrdup
+#define tqstrnicmp qstrnicmp
+#define tqstricmp qstricmp
+
+#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
 
 #endif
 
@@ -1218,7 +1218,7 @@ Boston, MA 02110-1301, USA.
 #define tqMakePair	qMakePair
 
 #define tqt_ucm_query_verification_data	qt_ucm_query_verification_data
-#define tqmemmove	tqmemmove
+#define tqmemmove	qmemmove
 
 #define TQ_ControlElement	ControlElement
 #define TQ_ComplexControl	ComplexControl
@@ -1544,10 +1544,10 @@ class QUObject;
 #define TQNoBrush Qt::NoBrush
 
 #define QMetaData QMetaMethod
-#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 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 TickSetting TickPosition
 #define ButtonState Qt::ButtonState
 #define qHeapSort tqHeapSort