From 9a8634c3f6ba13e37324deb3e3be0046169eaa2e Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 23 Sep 2011 07:19:06 +0000 Subject: [PATCH] Fix tqtinterface failing to connect TQ_UINT/TQ_INT signals and slots git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/tqtinterface@1255040 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- qtinterface/tqt-replace | 12 ++++++++++++ qtinterface/tqt-replace-stream | 14 +++++++++++++- qtinterface/tqt-replace-stream.cmake | 14 +++++++++++++- qtinterface/tqt-replace.cmake | 12 ++++++++++++ 4 files changed, 50 insertions(+), 2 deletions(-) diff --git a/qtinterface/tqt-replace b/qtinterface/tqt-replace index 7289db1..ee1f016 100755 --- a/qtinterface/tqt-replace +++ b/qtinterface/tqt-replace @@ -18,6 +18,18 @@ else sed -i 's/TQ_OVERRIDE/Q_OVERRIDE/g' "$1" sed -i 's/TQ_CLASSINFO/Q_CLASSINFO/g' "$1" sed -i 's/Qt::Orientation/Orientation/g' "$1" + sed -i 's/TQ_INT8/Q_INT8/g' "$1" + sed -i 's/TQ_INT16/Q_INT16/g' "$1" + sed -i 's/TQ_INT32/Q_INT32/g' "$1" + sed -i 's/TQ_INT64/Q_INT64/g' "$1" + sed -i 's/TQ_UINT8/Q_UINT8/g' "$1" + sed -i 's/TQ_UINT16/Q_UINT16/g' "$1" + sed -i 's/TQ_UINT32/Q_UINT32/g' "$1" + sed -i 's/TQ_UINT64/Q_UINT64/g' "$1" + sed -i 's/TQ_LONG/Q_LONG/g' "$1" + sed -i 's/TQ_LLONG/Q_LLONG/g' "$1" + sed -i 's/TQ_ULONG/Q_ULONG/g' "$1" + sed -i 's/TQ_ULLONG/Q_ULLONG/g' "$1" exit 0 fi diff --git a/qtinterface/tqt-replace-stream b/qtinterface/tqt-replace-stream index b105334..418715f 100755 --- a/qtinterface/tqt-replace-stream +++ b/qtinterface/tqt-replace-stream @@ -16,7 +16,19 @@ else sed 's/TQ_SETS/Q_SETS/g' | \ sed 's/TQ_OVERRIDE/Q_OVERRIDE/g' | \ sed 's/TQ_CLASSINFO/Q_CLASSINFO/g' | \ - sed 's/Qt::Orientation/Orientation/g' + sed 's/Qt::Orientation/Orientation/g' | \ + sed 's/TQ_INT8/Q_INT8/g' | \ + sed 's/TQ_INT16/Q_INT16/g' | \ + sed 's/TQ_INT32/Q_INT32/g' | \ + sed 's/TQ_INT64/Q_INT64/g' | \ + sed 's/TQ_UINT8/Q_UINT8/g' | \ + sed 's/TQ_UINT16/Q_UINT16/g' | \ + sed 's/TQ_UINT32/Q_UINT32/g' | \ + sed 's/TQ_UINT64/Q_UINT64/g' | \ + sed 's/TQ_LONG/Q_LONG/g' | \ + sed 's/TQ_LLONG/Q_LLONG/g' | \ + sed 's/TQ_ULONG/Q_ULONG/g' | \ + sed 's/TQ_ULLONG/Q_ULLONG/g' fi if [[ $QT_VER == 4 ]]; then diff --git a/qtinterface/tqt-replace-stream.cmake b/qtinterface/tqt-replace-stream.cmake index 9110a2e..5bdbf12 100755 --- a/qtinterface/tqt-replace-stream.cmake +++ b/qtinterface/tqt-replace-stream.cmake @@ -16,7 +16,19 @@ else sed 's/TQ_SETS/Q_SETS/g' | \ sed 's/TQ_OVERRIDE/Q_OVERRIDE/g' | \ sed 's/TQ_CLASSINFO/Q_CLASSINFO/g' | \ - sed 's/Qt::Orientation/Orientation/g' + sed 's/Qt::Orientation/Orientation/g' | \ + sed 's/TQ_INT8/Q_INT8/g' | \ + sed 's/TQ_INT16/Q_INT16/g' | \ + sed 's/TQ_INT32/Q_INT32/g' | \ + sed 's/TQ_INT64/Q_INT64/g' | \ + sed 's/TQ_UINT8/Q_UINT8/g' | \ + sed 's/TQ_UINT16/Q_UINT16/g' | \ + sed 's/TQ_UINT32/Q_UINT32/g' | \ + sed 's/TQ_UINT64/Q_UINT64/g' | \ + sed 's/TQ_LONG/Q_LONG/g' | \ + sed 's/TQ_LLONG/Q_LLONG/g' | \ + sed 's/TQ_ULONG/Q_ULONG/g' | \ + sed 's/TQ_ULLONG/Q_ULLONG/g' fi if [[ $QT_VERSION == 4 ]]; then diff --git a/qtinterface/tqt-replace.cmake b/qtinterface/tqt-replace.cmake index c081dce..193510e 100755 --- a/qtinterface/tqt-replace.cmake +++ b/qtinterface/tqt-replace.cmake @@ -18,6 +18,18 @@ else sed -i 's/TQ_OVERRIDE/Q_OVERRIDE/g' "$1" sed -i 's/TQ_CLASSINFO/Q_CLASSINFO/g' "$1" sed -i 's/Qt::Orientation/Orientation/g' "$1" + sed -i 's/TQ_INT8/Q_INT8/g' "$1" + sed -i 's/TQ_INT16/Q_INT16/g' "$1" + sed -i 's/TQ_INT32/Q_INT32/g' "$1" + sed -i 's/TQ_INT64/Q_INT64/g' "$1" + sed -i 's/TQ_UINT8/Q_UINT8/g' "$1" + sed -i 's/TQ_UINT16/Q_UINT16/g' "$1" + sed -i 's/TQ_UINT32/Q_UINT32/g' "$1" + sed -i 's/TQ_UINT64/Q_UINT64/g' "$1" + sed -i 's/TQ_LONG/Q_LONG/g' "$1" + sed -i 's/TQ_LLONG/Q_LLONG/g' "$1" + sed -i 's/TQ_ULONG/Q_ULONG/g' "$1" + sed -i 's/TQ_ULLONG/Q_ULLONG/g' "$1" exit 0 fi