From 0f638a4a92e434651b661781f7adf451a3cbedfd Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 12 Feb 2012 18:58:52 -0600 Subject: [PATCH] Fix conversion problems and generate moc c files --- qt3-tqt3/convert_qt_itself_qt3_batch2 | 26 +++++++++++++------------- qt3-tqt3/create_tqt3_from_qt3 | 7 ++++++- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/qt3-tqt3/convert_qt_itself_qt3_batch2 b/qt3-tqt3/convert_qt_itself_qt3_batch2 index 0e1dfae..37a03bd 100755 --- a/qt3-tqt3/convert_qt_itself_qt3_batch2 +++ b/qt3-tqt3/convert_qt_itself_qt3_batch2 @@ -16,19 +16,19 @@ find ./ -type f -iname "*" -exec sed -i 's/QT_TR_FUNCTIONS/TQT_TR_FUNCTIONS/g' { find ./ -type f -iname "*" -exec sed -i 's/Q_OBJECT/TQ_OBJECT/g' {} \; find ./ -type f -iname "*" -exec sed -i 's/TTQ_OBJECT/TQ_OBJECT/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/\([ :-()+/{*},[\t]\)qRound/\1tqRound/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/\([ :-()+/{*},[\t]\)qSwap/\1tqSwap/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/\([ :-()+/{*},[\t]\)qstrlen/\1tqstrlen/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/\([ :-()+/{*},[\t]\)qstrncmp/\1tqstrncmp/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/\([ :-()+/{*},[\t]\)qUncompress/\1tqUncompress/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/\([ :-()+/{*},[\t]\)qCopy/\1tqCopy/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/\([ :-()+/{*},[\t]\)qCopyBackward/\1tqCopyBackward/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/\([ :-()+/{*},[\t]\)qEqual/\1tqEqual/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/\([ :-()+/{*},[\t]\)qFill/\1tqFill/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/\([ :-()+/{*},[\t]\)qFind/\1tqFind/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/\([ :-()+/{*},[\t]\)qCount/\1tqCount/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/\([ :-()+/{*},[\t]\)qHash/\1tqHash/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/\([ :-()+/{*},[\t]\)qAppName/\1tqAppName/g' {} \; +find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},:[\t ]\)qRound/\1tqRound/g' {} \; +find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},:[\t ]\)qSwap/\1tqSwap/g' {} \; +find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},:[\t ]\)qstrlen/\1tqstrlen/g' {} \; +find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},:[\t ]\)qstrncmp/\1tqstrncmp/g' {} \; +find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},:[\t ]\)qUncompress/\1tqUncompress/g' {} \; +find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},:[\t ]\)qCopy/\1tqCopy/g' {} \; +find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},:[\t ]\)qCopyBackward/\1tqCopyBackward/g' {} \; +find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},:[\t ]\)qEqual/\1tqEqual/g' {} \; +find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},:[\t ]\)qFill/\1tqFill/g' {} \; +find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},:[\t ]\)qFind/\1tqFind/g' {} \; +find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},:[\t ]\)qCount/\1tqCount/g' {} \; +find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},:[\t ]\)qHash/\1tqHash/g' {} \; +find ./ -type f -iname "*" -exec sed -i 's/\([-()+/{*},:[\t ]\)qAppName/\1tqAppName/g' {} \; find ./ -type f -iname "*" -exec sed -i 's/^qRound/tqRound/g' {} \; find ./ -type f -iname "*" -exec sed -i 's/^qSwap/tqSwap/g' {} \; diff --git a/qt3-tqt3/create_tqt3_from_qt3 b/qt3-tqt3/create_tqt3_from_qt3 index 13e60f8..2f04ea7 100755 --- a/qt3-tqt3/create_tqt3_from_qt3 +++ b/qt3-tqt3/create_tqt3_from_qt3 @@ -5,4 +5,9 @@ cd tqt3 ../convert_qt_itself_qt3 ../header_rename_1 patch -p0 < ../tqt3_fixups_batch2.diff -../convert_qt_itself_qt3_batch2 \ No newline at end of file +../convert_qt_itself_qt3_batch2 + +cd src/moc/ +yacc -d moc.y -o moc_yacc && mv moc_yacc moc_yacc.cpp +flex moc.l +mv lex.yy.c moc_lex.cpp \ No newline at end of file