diff --git a/qtinterface/tqt-replace b/qtinterface/tqt-replace index a1ed332..4886e8e 100755 --- a/qtinterface/tqt-replace +++ b/qtinterface/tqt-replace @@ -6,7 +6,7 @@ if [[ $1 == "" ]]; then 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_]\)/\1Q\2/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 1b670c1..c0afb81 100755 --- a/qtinterface/tqt-replace-stream +++ b/qtinterface/tqt-replace-stream @@ -7,7 +7,7 @@ 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_]\)/\1Q\2/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 2ff69ec..a436ce4 100755 --- a/qtinterface/tqt-replace-stream.cmake +++ b/qtinterface/tqt-replace-stream.cmake @@ -7,7 +7,7 @@ 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_]\)/\1Q\2/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 1542ce4..e580894 100755 --- a/qtinterface/tqt-replace.cmake +++ b/qtinterface/tqt-replace.cmake @@ -6,7 +6,7 @@ if [[ $1 == "" ]]; then 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_]\)/\1Q\2/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"