summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-07 17:23:06 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-07 17:23:06 +0000
commit36bab59a1bfb67cb6f901da0d811a7b6c021ab0e (patch)
tree3eae9a8959a07e64aa80b3286d5d6f1580b28d53
parent1144ee059fa780c9b1da9e889fe3899d5e050649 (diff)
downloadtqtinterface-36bab59a1bfb67cb6f901da0d811a7b6c021ab0e.tar.gz
tqtinterface-36bab59a1bfb67cb6f901da0d811a7b6c021ab0e.zip
Apply r1239185 to the other three TQt3 handler files
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/tqtinterface@1240356 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rwxr-xr-xqtinterface/tqt-replace1
-rwxr-xr-xqtinterface/tqt-replace-stream.cmake3
-rwxr-xr-xqtinterface/tqt-replace.cmake1
3 files changed, 4 insertions, 1 deletions
diff --git a/qtinterface/tqt-replace b/qtinterface/tqt-replace
index 4886e8e..3aa36a4 100755
--- a/qtinterface/tqt-replace
+++ b/qtinterface/tqt-replace
@@ -11,6 +11,7 @@ else
sed -i 's/Q_SLOTS>/slots>/g' "$1"
sed -i 's/Q_SIGNALS>/signals>/g' "$1"
sed -i 's/Q\([^ _]*\)_OBJECT_NAME_STRING/TQ\1_OBJECT_NAME_STRING/g' "$1"
+ sed -i 's/\([ \t]\)tq\([^:(_)\t ]\)/\1\2/g' "$1"
exit 0
fi
diff --git a/qtinterface/tqt-replace-stream.cmake b/qtinterface/tqt-replace-stream.cmake
index a436ce4..ea269d0 100755
--- a/qtinterface/tqt-replace-stream.cmake
+++ b/qtinterface/tqt-replace-stream.cmake
@@ -9,7 +9,8 @@ else
sed 's/^TQ\([^T_]\)/Q\1/g' | \
sed 's/\([^_]\)TQ\([^T_]\)/\1Q\2/g' | \
sed 's/TQT\([^_]\)/QT\1/g' | \
- sed 's/Q\([^ _]*\)_OBJECT_NAME_STRING/TQ\1_OBJECT_NAME_STRING/g'
+ sed 's/Q\([^ _]*\)_OBJECT_NAME_STRING/TQ\1_OBJECT_NAME_STRING/g' | \
+ sed 's/\([ \t]\)tq\([^:(_)\t ]\)/\1\2/g'
fi
if [[ $QT_VERSION == 4 ]]; then
diff --git a/qtinterface/tqt-replace.cmake b/qtinterface/tqt-replace.cmake
index e580894..4361a7a 100755
--- a/qtinterface/tqt-replace.cmake
+++ b/qtinterface/tqt-replace.cmake
@@ -11,6 +11,7 @@ else
sed -i 's/Q_SLOTS>/slots>/g' "$1"
sed -i 's/Q_SIGNALS>/signals>/g' "$1"
sed -i 's/Q\([^ _]*\)_OBJECT_NAME_STRING/TQ\1_OBJECT_NAME_STRING/g' "$1"
+ sed -i sed 's/\([ \t]\)tq\([^:(_)\t ]\)/\1\2/g' "$1"
exit 0
fi