From 0d688e3383b6ec087c0c4bd709ee86e22557686c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 17 Feb 2012 15:08:43 -0600 Subject: Use only Q_OBJECT instead of both TQ_OBJECT and Q_OBJECT --- qtinterface/tqt-replace-stream-tqt3.cmake | 2 +- qtinterface/tqt-replace-tqt3.cmake | 2 ++ qtinterface/tqt.h.cmake | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'qtinterface') diff --git a/qtinterface/tqt-replace-stream-tqt3.cmake b/qtinterface/tqt-replace-stream-tqt3.cmake index ca2e985..c30e562 100755 --- a/qtinterface/tqt-replace-stream-tqt3.cmake +++ b/qtinterface/tqt-replace-stream-tqt3.cmake @@ -4,5 +4,5 @@ QT_VERSION=@QT_VERSION@ if [[ $1 == "" ]]; then echo "Usage: tqt-replace-stream " else - cat $1 + cat $1 | sed 's/^Q_OBJECT/TQ_OBJECT/g' | sed 's/\([^T]\)Q_OBJECT/\1TQ_OBJECT/g' fi diff --git a/qtinterface/tqt-replace-tqt3.cmake b/qtinterface/tqt-replace-tqt3.cmake index 194d5ac..cb7de9c 100755 --- a/qtinterface/tqt-replace-tqt3.cmake +++ b/qtinterface/tqt-replace-tqt3.cmake @@ -6,5 +6,7 @@ if [[ $1 == "" ]]; then else sed -i 's/Q_SLOTS>/slots>/g' "$1" sed -i 's/Q_SIGNALS>/signals>/g' "$1" + sed -i 's/^Q_OBJECT/TQ_OBJECT/g' "$1" + sed -i 's/\([^T]\)Q_OBJECT/\1TQ_OBJECT/g' "$1" exit 0 fi diff --git a/qtinterface/tqt.h.cmake b/qtinterface/tqt.h.cmake index e4aa415..803075f 100644 --- a/qtinterface/tqt.h.cmake +++ b/qtinterface/tqt.h.cmake @@ -67,7 +67,7 @@ Boston, MA 02110-1301, USA. #ifdef TQT_REAL_TQT #define Qt TQt #ifndef TQT_NO_COMPAT_NAMES -#define Q_OBJECT /* UNUSED */ +#define Q_OBJECT TQ_OBJECT #endif /* TQT_NO_COMPAT_NAMES */ #else /* TQT_REAL_TQT */ #define TQ_OBJECT /* UNUSED */ -- cgit v1.2.1