diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-29 08:59:13 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-29 08:59:13 +0000 |
| commit | c0a0dbb535084b971cdc88299d0949aaed4d8a1f (patch) | |
| tree | fb525044afababa7cf7b3a91a62e8d0ef9c7eb21 | |
| parent | 717d57b51a17d7eb8afa5a33d9df0d172adf2b1f (diff) | |
| download | tqtinterface-c0a0dbb535084b971cdc88299d0949aaed4d8a1f.tar.gz tqtinterface-c0a0dbb535084b971cdc88299d0949aaed4d8a1f.zip | |
Fix TQt3 mocing of properties and enums
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/tqtinterface@1250067 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
| -rwxr-xr-x | qtinterface/tqt-replace | 5 | ||||
| -rwxr-xr-x | qtinterface/tqt-replace-stream | 7 | ||||
| -rwxr-xr-x | qtinterface/tqt-replace-stream.cmake | 7 | ||||
| -rwxr-xr-x | qtinterface/tqt-replace.cmake | 5 |
4 files changed, 22 insertions, 2 deletions
diff --git a/qtinterface/tqt-replace b/qtinterface/tqt-replace index 3aa36a4..914732f 100755 --- a/qtinterface/tqt-replace +++ b/qtinterface/tqt-replace @@ -12,6 +12,11 @@ else 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" + sed -i 's/TQ_PROPERTY/Q_PROPERTY/g' "$1" + sed -i 's/TQ_ENUMS/Q_ENUMS/g' "$1" + sed -i 's/TQ_SETS/Q_SETS/g' "$1" + sed -i 's/TQ_OVERRIDE/Q_OVERRIDE/g' "$1" + sed -i 's/TQ_CLASSINFO/Q_CLASSINFO/g' "$1" exit 0 fi diff --git a/qtinterface/tqt-replace-stream b/qtinterface/tqt-replace-stream index f063a34..261146a 100755 --- a/qtinterface/tqt-replace-stream +++ b/qtinterface/tqt-replace-stream @@ -10,7 +10,12 @@ else 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/\([ \t]\)tq\([^:(_)\t ]\)/\1\2/g' + sed 's/\([ \t]\)tq\([^:(_)\t ]\)/\1\2/g' | \ + sed 's/TQ_PROPERTY/Q_PROPERTY/g' | \ + sed 's/TQ_ENUMS/Q_ENUMS/g' | \ + sed 's/TQ_SETS/Q_SETS/g' | \ + sed 's/TQ_OVERRIDE/Q_OVERRIDE/g' | \ + sed 's/TQ_CLASSINFO/Q_CLASSINFO/g' fi if [[ $QT_VER == 4 ]]; then diff --git a/qtinterface/tqt-replace-stream.cmake b/qtinterface/tqt-replace-stream.cmake index ea269d0..84c1083 100755 --- a/qtinterface/tqt-replace-stream.cmake +++ b/qtinterface/tqt-replace-stream.cmake @@ -10,7 +10,12 @@ else 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/\([ \t]\)tq\([^:(_)\t ]\)/\1\2/g' + sed 's/\([ \t]\)tq\([^:(_)\t ]\)/\1\2/g' | \ + sed 's/TQ_PROPERTY/Q_PROPERTY/g' | \ + sed 's/TQ_ENUMS/Q_ENUMS/g' | \ + sed 's/TQ_SETS/Q_SETS/g' | \ + sed 's/TQ_OVERRIDE/Q_OVERRIDE/g' | \ + sed 's/TQ_CLASSINFO/Q_CLASSINFO/g' fi if [[ $QT_VERSION == 4 ]]; then diff --git a/qtinterface/tqt-replace.cmake b/qtinterface/tqt-replace.cmake index 4361a7a..97ace27 100755 --- a/qtinterface/tqt-replace.cmake +++ b/qtinterface/tqt-replace.cmake @@ -12,6 +12,11 @@ else 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" + sed -i 's/TQ_PROPERTY/Q_PROPERTY/g' "$1" + sed -i 's/TQ_ENUMS/Q_ENUMS/g' "$1" + sed -i 's/TQ_SETS/Q_SETS/g' "$1" + sed -i 's/TQ_OVERRIDE/Q_OVERRIDE/g' "$1" + sed -i 's/TQ_CLASSINFO/Q_CLASSINFO/g' "$1" exit 0 fi |