diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-14 06:24:27 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-14 06:24:27 +0000 |
| commit | 02c81d1c6b2e174f3f82006c6fbac9fbe2718e55 (patch) | |
| tree | 97bbe3e2922c3b92a763c35f003d5316136213f6 | |
| parent | c2c0603708e271d70ef63aa8ee0c87747c87e521 (diff) | |
| download | tqtinterface-02c81d1c.tar.gz tqtinterface-02c81d1c.zip | |
Fix handling of TQT_TQ* in .ui files
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/tqtinterface@1231776 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
| -rwxr-xr-x | qtinterface/tqt-replace | 3 | ||||
| -rwxr-xr-x | qtinterface/tqt-replace-stream | 3 | ||||
| -rwxr-xr-x | qtinterface/tqt-replace-stream.cmake | 3 | ||||
| -rwxr-xr-x | qtinterface/tqt-replace.cmake | 3 |
4 files changed, 8 insertions, 4 deletions
diff --git a/qtinterface/tqt-replace b/qtinterface/tqt-replace index e0b9e2b..a1ed332 100755 --- a/qtinterface/tqt-replace +++ b/qtinterface/tqt-replace @@ -5,7 +5,8 @@ if [[ $1 == "" ]]; then echo "Usage: tqt-replace <input_file>" else if [[ $QT_VER == 3 ]]; then - sed -i 's/TQ\([^T_]\)/Q\1/g' "$1" + sed -i 's/^TQ\([^T_]\)/Q\1/g' "$1" + sed -i 's/[^_]TQ\([^T_]\)/Q\1/g' "$1" sed -i 's/TQT\([^_]\)/QT\1/g' "$1" sed -i 's/Q_SLOTS>/slots>/g' "$1" sed -i 's/Q_SIGNALS>/signals>/g' "$1" diff --git a/qtinterface/tqt-replace-stream b/qtinterface/tqt-replace-stream index ea20373..1b670c1 100755 --- a/qtinterface/tqt-replace-stream +++ b/qtinterface/tqt-replace-stream @@ -6,7 +6,8 @@ if [[ $1 == "" ]]; then else if [[ $QT_VER == 3 ]]; then cat $1 | \ - sed 's/TQ\([^T_]\)/Q\1/g' | \ + sed 's/^TQ\([^T_]\)/Q\1/g' | \ + sed 's/[^_]TQ\([^T_]\)/Q\1/g' | \ sed 's/TQT\([^_]\)/QT\1/g' | \ sed 's/Q\([^ _]*\)_OBJECT_NAME_STRING/TQ\1_OBJECT_NAME_STRING/g' fi diff --git a/qtinterface/tqt-replace-stream.cmake b/qtinterface/tqt-replace-stream.cmake index 076c625..2ff69ec 100755 --- a/qtinterface/tqt-replace-stream.cmake +++ b/qtinterface/tqt-replace-stream.cmake @@ -6,7 +6,8 @@ if [[ $1 == "" ]]; then else if [[ $QT_VERSION == 3 ]]; then cat $1 | \ - sed 's/TQ\([^T_]\)/Q\1/g' | \ + sed 's/^TQ\([^T_]\)/Q\1/g' | \ + sed 's/[^_]TQ\([^T_]\)/Q\1/g' | \ sed 's/TQT\([^_]\)/QT\1/g' | \ sed 's/Q\([^ _]*\)_OBJECT_NAME_STRING/TQ\1_OBJECT_NAME_STRING/g' fi diff --git a/qtinterface/tqt-replace.cmake b/qtinterface/tqt-replace.cmake index 704826f..1542ce4 100755 --- a/qtinterface/tqt-replace.cmake +++ b/qtinterface/tqt-replace.cmake @@ -5,7 +5,8 @@ if [[ $1 == "" ]]; then echo "Usage: tqt-replace <input_file>" else if [[ $QT_VERSION == 3 ]]; then - sed -i 's/TQ\([^T_]\)/Q\1/g' "$1" + sed -i 's/^TQ\([^T_]\)/Q\1/g' "$1" + sed -i 's/[^_]TQ\([^T_]\)/Q\1/g' "$1" sed -i 's/TQT\([^_]\)/QT\1/g' "$1" sed -i 's/Q_SLOTS>/slots>/g' "$1" sed -i 's/Q_SIGNALS>/signals>/g' "$1" |