From 529d5994c5ef1583be7ab56720dc8c1510031364 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 24 Aug 2011 12:23:00 -0500 Subject: [PATCH] Clean up said scripts a bit --- qt3-tqt3/convert_qt_itself_qt3 | 89 ---------------------------------- 1 file changed, 89 deletions(-) diff --git a/qt3-tqt3/convert_qt_itself_qt3 b/qt3-tqt3/convert_qt_itself_qt3 index 8f0b8b6..f12e1d7 100755 --- a/qt3-tqt3/convert_qt_itself_qt3 +++ b/qt3-tqt3/convert_qt_itself_qt3 @@ -1,8 +1,5 @@ #!/bin/bash -#find ./ -type f -iname "*.c*" -exec sed -i 's/Q\([ABCDEFGHIJKLMNOPQRSTUVWXYZ]\)\([_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ]\)\([_abcdefghijklmnopqrstuvwxyzDE]\)/TQ\1\2\3/g' {} \; -#find ./ -type f -iname "*.h*" -exec sed -i 's/Q\([ABCDEFGHIJKLMNOPQRSTUVWXYZ]\)\([_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ]\)\([_abcdefghijklmnopqrstuvwxyzDE]\)/TQ\1\2\3/g' {} \; - find ./ -type f -iname "*.c*" -exec sed -i 's/^Q\([ABCDEFGHIJKLMNOPQRSTUVWXYZ]\)\([_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ]\)/TQ\1\2/g' {} \; find ./ -type f -iname "*.h*" -exec sed -i 's/^Q\([ABCDEFGHIJKLMNOPQRSTUVWXYZ]\)\([_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ]\)/TQ\1\2/g' {} \; @@ -36,86 +33,6 @@ sed -i 's/TTQ/TQ/g' src/moc/moc.y sed -i 's/TTQ/TQ/g' src/moc/moc.l sed -i 's/TTQ/TQ/g' src/moc/moc.y -if [[ 0 == 1 ]]; then - -find ./ -type f -iname "*.c*" -exec sed -i 's/\([^_]\)METHOD\([( ]\)/\1TQT_METHOD\2/g' {} \; -find ./ -type f -iname "*.h*" -exec sed -i 's/\([^_]\)METHOD\([( ]\)/\1TQT_METHOD\2/g' {} \; -find ./ -type f -iname "*.c*" -exec sed -i 's/\([^_]\)SLOT\([( ]\)/\1TQT_SLOT\2/g' {} \; -find ./ -type f -iname "*.h*" -exec sed -i 's/\([^_]\)SLOT\([( ]\)/\1TQT_SLOT\2/g' {} \; -find ./ -type f -iname "*.c*" -exec sed -i 's/\([^_]\)SIGNAL\([( ]\)/\1TQT_SIGNAL\2/g' {} \; -find ./ -type f -iname "*.h*" -exec sed -i 's/\([^_]\)SIGNAL\([( ]\)/\1TQT_SIGNAL\2/g' {} \; - -find ./ -type f -iname "*.h*" -exec sed -i 's/TQT_TQT_/TQT_/g' {} \; -find ./ -type f -iname "*.h*" -exec sed -i 's/TQT_TQT_/TQT_/g' {} \; -find ./ -type f -iname "*.h*" -exec sed -i 's/TQT_TQT_/TQT_/g' {} \; -find ./ -type f -iname "*.h*" -exec sed -i 's/TQT_TQT_/TQT_/g' {} \; -find ./ -type f -iname "*.c*" -exec sed -i 's/TQT_TQT_/TQT_/g' {} \; -find ./ -type f -iname "*.c*" -exec sed -i 's/TQT_TQT_/TQT_/g' {} \; -find ./ -type f -iname "*.c*" -exec sed -i 's/TQT_TQT_/TQT_/g' {} \; -find ./ -type f -iname "*.c*" -exec sed -i 's/TQT_TQT_/TQT_/g' {} \; - -find ./ -type f -iname "*" -exec sed -i 's/MOC/TQMOC/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/TQTQMOC/TQMOC/g' {} \; - -find ./ -type f -iname "*" -exec sed -i 's/RGB_MASK/TQRGB_MASK/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/TQTQRGB_MASK/TQRGB_MASK/g' {} \; - -find ./ -type f -iname "*" -exec sed -i 's/tqslots/Q_SLOTS/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/tqsignals/Q_SIGNALS/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/Q_SIGNALSlotimp\.h/tqsignalslotimp\.h/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/TQ_SLOTS/Q_SLOTS/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/TQ_SIGNALS/Q_SIGNALS/g' {} \; - -find ./ -type f -iname "*.c*" -exec sed -i 's/Q_/TQ_/g' {} \; -find ./ -type f -iname "*.h*" -exec sed -i 's/Q_/TQ_/g' {} \; - -# Certain Things Are Sacred -cd src/ - -# Rename headers -../../convert_qt_itself_qt3_rename - -# Move files -find . -type d -exec ../../convert_qt_itself_qt3_helper "{}" \; - -cd ../ - -cd qmake/ - -# Rename headers -../../convert_qt_itself_qt3_rename - -cd ../ - -cd tools/ - -# Rename headers -../../convert_qt_itself_qt3_rename - -cd ../ - -cd qmake/ - -find . -type d -exec ../../convert_qt_itself_qt3_helper "{}" \; -../../convert_qt_itself_qt3_rename - -cd ../ - -cd include -ls -l | awk '{print "ln -s", $10, " ", $8, " && rm ", $8}' | sed 's/\(.*\) q\(.*\)\.h/\1 tq\2\.h/g' | sed 's/\(.*\)\/q\(.*\)\.h/\1\/tq\2\.h/g' | sh -cd .. - -for i in {1..50} -do - find ./ -type f -iname "*.pro" -exec sed -i 's/\(.*\)\/q\(.*\)\.c\(.*\)/\1\/tq\2\.c\3/g' {} \; - find ./ -type f -iname "*.pro" -exec sed -i 's/\(.*\)\/q\(.*\)\.h\(.*\)/\1\/tq\2\.h\3/g' {} \; - - find ./ -type f -iname "*.pri" -exec sed -i 's/\(.*\)\/q\(.*\)\.c\(.*\)/\1\/tq\2\.c\3/g' {} \; - find ./ -type f -iname "*.pri" -exec sed -i 's/\(.*\)\/q\(.*\)\.h\(.*\)/\1\/tq\2\.h\3/g' {} \; -done - -fi - # Back out changes we did not want to make find ./ -type f -iname "*" -exec sed -i 's/TQT_/QT_/g' {} \; find ./ -type f -iname "*" -exec sed -i 's/TQMAKE/QMAKE/g' {} \; @@ -131,9 +48,3 @@ find ./ -type f -iname "*" -exec sed -i 's/STQL/SQL/g' {} \; patch -p0 < ../tqt3_fixups.diff exit 0 - -# Fix up configure -sed -i 's/qconfig\./tqconfig\./g' configure -sed -i 's/qmodules\./tqmodules\./g' configure -#sed -i 's/qtmd5/tqtmd5/g' ./qmake/Makefile.unix -sed -i 's/\([ =/]\)q/\1tq/g' ./qmake/Makefile.unix