Update autoconversion script to remove potential conflicts with Qt4

1 files changed, 114 insertions, 0 deletions

diff --git a/qt3-tqt3/convert_qt_itself_qt3_batch2 b/qt3-tqt3/convert_qt_itself_qt3_batch2
index 37113a1..ad3ec61 100755
--- a/qt3-tqt3/convert_qt_itself_qt3_batch2
+++ b/qt3-tqt3/convert_qt_itself_qt3_batch2
@@ -58,4 +58,118 @@ find ./ -type f -iname "*" -exec sed -i 's/^qRgb/tqRgb/g' {} \;
 find ./ -type f -iname "*" -exec sed -i 's/^qGray/tqGray/g' {} \;
 find ./ -type f -iname "*" -exec sed -i 's/^qApp/tqApp/g' {} \;
 
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qAddPostRoutine/\1tqAddPostRoutine/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qWarning/\1tqWarning/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qSharedBuild/\1tqSharedBuild/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qNetworkProtocolRegister/\1tqNetworkProtocolRegister/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qDebug/\1tqDebug/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qCompress/\1tqCompress/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qFatal/\1tqFatal/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qSqlDriverExtDict/\1tqSqlDriverExtDict/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qSqlOpenExtDict/\1tqSqlOpenExtDict/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qInitNetworkProtocols/\1tqInitNetworkProtocols/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qSuppressObsoleteWarnings/\1tqSuppressObsoleteWarnings/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qChecksum/\1tqChecksum/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qRemovePostRoutine/\1tqRemovePostRoutine/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qInstallPath/\1tqInstallPath/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qObsolete/\1tqObsolete/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qVersion/\1tqVersion/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qSystemWarning/\1tqSystemWarning/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qSysInfo/\1tqSysInfo/g' {} \;
+
+find ./ -type f -iname "*" -exec sed -i 's/^qAddPostRoutine/tqAddPostRoutine/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/^qWarning/tqWarning/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/^qSharedBuild/tqSharedBuild/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/^qNetworkProtocolRegister/tqNetworkProtocolRegister/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/^qDebug/tqDebug/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/^qCompress/tqCompress/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/^qFatal/tqFatal/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/^qSqlDriverExtDict/tqSqlDriverExtDict/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/^qSqlOpenExtDict/tqSqlOpenExtDict/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/^qInitNetworkProtocols/tqInitNetworkProtocols/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/^qSuppressObsoleteWarnings/tqSuppressObsoleteWarnings/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/^qChecksum/tqChecksum/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/^qRemovePostRoutine/tqRemovePostRoutine/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/^qInstallPath/tqInstallPath/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/^qObsolete/tqObsolete/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/^qVersion/tqVersion/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/^qSystemWarning/tqSystemWarning/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/^qSysInfo/tqSysInfo/g' {} \;
+
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qmemmove/\1tqmemmove/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qstrncpy/\1tqstrncpy/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qstrdup/\1tqstrdup/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qstrnicmp/\1tqstrnicmp/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qstricmp/\1tqstricmp/g' {} \;
+
+find ./ -type f -iname "*" -exec sed -i 's/^qmemmove/tqmemmove/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/^qstrncpy/tqstrncpy/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/^qstrdup/tqstrdup/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/^qstrnicmp/tqstrnicmp/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/^qstricmp/tqstricmp/g' {} \;
+
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qt_get_application_thread_id/\1tqt_get_application_thread_id/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qt_x_user_time/\1tqt_x_user_time/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qt_xget_temp_gc/\1tqt_xget_temp_gc/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qt_has_xft/\1tqt_has_xft/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qt_modal_state/\1tqt_modal_state/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qt_check_pointer/\1tqt_check_pointer/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qt_preliminary_signal_spy/\1tqt_preliminary_signal_spy/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qt_wm_take_focus/\1tqt_wm_take_focus/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qt_global_mutexpool/\1tqt_global_mutexpool/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qt_xdisplay/\1tqt_xdisplay/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qt_resolve_symlinks/\1tqt_resolve_symlinks/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qt_qclipboard_bailout_hack/\1tqt_qclipboard_bailout_hack/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qt_x_time/\1tqt_x_time/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qt_wm_delete_window/\1tqt_wm_delete_window/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qt_qheader_label_return_null_strings/\1tqt_qheader_label_return_null_strings/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qt_xscreen/\1tqt_xscreen/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qt_setAccelAutoShortcuts/\1tqt_setAccelAutoShortcuts/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qt_sm_client_id/\1tqt_sm_client_id/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qt_set_table_clipper_enabled/\1tqt_set_table_clipper_enabled/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qt_hebrew_keyboard_hack/\1tqt_hebrew_keyboard_hack/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qt_use_native_dialogs/\1tqt_use_native_dialogs/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qt_generate_epsf/\1tqt_generate_epsf/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qt_xget_readonly_gc/\1tqt_xget_readonly_gc/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qt_use_xrender/\1tqt_use_xrender/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qt_set_x11_event_filter/\1tqt_set_x11_event_filter/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qt_xrootwin/\1tqt_xrootwin/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qt_wm_protocols/\1tqt_wm_protocols/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qt_ftp_filename_codec/\1tqt_ftp_filename_codec/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qt_window_role/\1tqt_window_role/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qt_tab_all_widgets/\1tqt_tab_all_widgets/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},!:=[\t ]\)qt_wm_state/\1tqt_wm_state/g' {} \;
+
+find ./ -type f -iname "*" -exec sed -i 's/^qt_get_application_thread_id/tqt_get_application_thread_id/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/^qt_x_user_time/tqt_x_user_time/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/^qt_xget_temp_gc/tqt_xget_temp_gc/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/^qt_has_xft/tqt_has_xft/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/^qt_modal_state/tqt_modal_state/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/^qt_check_pointer/tqt_check_pointer/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/^qt_preliminary_signal_spy/tqt_preliminary_signal_spy/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/^qt_wm_take_focus/tqt_wm_take_focus/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/^qt_global_mutexpool/tqt_global_mutexpool/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/^qt_xdisplay/tqt_xdisplay/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/^qt_resolve_symlinks/tqt_resolve_symlinks/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/^qt_qclipboard_bailout_hack/tqt_qclipboard_bailout_hack/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/^qt_x_time/tqt_x_time/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/^qt_wm_delete_window/tqt_wm_delete_window/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/^qt_qheader_label_return_null_strings/tqt_qheader_label_return_null_strings/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/^qt_xscreen/tqt_xscreen/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/^qt_setAccelAutoShortcuts/tqt_setAccelAutoShortcuts/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/^qt_sm_client_id/tqt_sm_client_id/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/^qt_set_table_clipper_enabled/tqt_set_table_clipper_enabled/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/^qt_hebrew_keyboard_hack/tqt_hebrew_keyboard_hack/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/^qt_use_native_dialogs/tqt_use_native_dialogs/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/^qt_generate_epsf/tqt_generate_epsf/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/^qt_xget_readonly_gc/tqt_xget_readonly_gc/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/^qt_use_xrender/tqt_use_xrender/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/^qt_set_x11_event_filter/tqt_set_x11_event_filter/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/^qt_xrootwin/tqt_xrootwin/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/^qt_wm_protocols/tqt_wm_protocols/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/^qt_ftp_filename_codec/tqt_ftp_filename_codec/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/^qt_window_role/tqt_window_role/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/^qt_tab_all_widgets/tqt_tab_all_widgets/g' {} \;
+find ./ -type f -iname "*" -exec sed -i 's/^qt_wm_state/tqt_wm_state/g' {} \;
+
 exit 0