diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-17 15:08:43 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-17 15:08:43 -0600 |
| commit | 0d688e3383b6ec087c0c4bd709ee86e22557686c (patch) | |
| tree | 662a9208d9c7f83c52bcb591a9a48a9660862b8c /qtinterface | |
| parent | 7aaf564f566307b7ec3688f60fd7452747a6e935 (diff) | |
| download | tqtinterface-0d688e3383b6ec087c0c4bd709ee86e22557686c.tar.gz tqtinterface-0d688e3383b6ec087c0c4bd709ee86e22557686c.zip | |
Use only Q_OBJECT instead of both TQ_OBJECT and Q_OBJECT
Diffstat (limited to 'qtinterface')
| -rwxr-xr-x | qtinterface/tqt-replace-stream-tqt3.cmake | 2 | ||||
| -rwxr-xr-x | qtinterface/tqt-replace-tqt3.cmake | 2 | ||||
| -rw-r--r-- | qtinterface/tqt.h.cmake | 2 |
3 files changed, 4 insertions, 2 deletions
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 <filename>" 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 */ |