From d40da5242554e36f1c52a1ba6eb4d74da8cc3c28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 2 Jul 2013 01:55:28 +0200 Subject: Fix at this time unintended renaming of Q_OBJECT --- qt3-tqt3/convert_existing_qt3_app_to_tqt3 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/qt3-tqt3/convert_existing_qt3_app_to_tqt3 b/qt3-tqt3/convert_existing_qt3_app_to_tqt3 index 55db71e..526262e 100755 --- a/qt3-tqt3/convert_existing_qt3_app_to_tqt3 +++ b/qt3-tqt3/convert_existing_qt3_app_to_tqt3 @@ -20,6 +20,7 @@ xargs -r0 sed -i \ # Back out changes we did not want to make find ./ -type f -iname "*" -not -iwholename '*.git*' -print0 |\ xargs -r0 sed -i \ + -e 's/TQ_OBJECT/Q_OBJECT/g' \ -e 's/TQT_/QT_/g' \ -e 's/TQMAKE/QMAKE/g' \ -e 's/TQTDIR/QTDIR/g' \ @@ -58,8 +59,6 @@ xargs -r0 sed -i \ -e 's/QT_MODULE_/TQT_MODULE_/g' \ -e 's/TTQT_MODULE_/TQT_MODULE_/g' \ -e 's/QT_TR_FUNCTIONS/TQT_TR_FUNCTIONS/g' \ - -e 's/Q_OBJECT/TQ_OBJECT/g' \ - -e 's/TTQ_OBJECT/TQ_OBJECT/g' \ -e 's/RGB_MASK/TQT_RGB_MASK/g' \ \ -e 's/\([-()+/{*},.>!:=&[\t ]\)qRound/\1tqRound/g' \ -- cgit v1.2.3