Rename TQT_{METHOD, SIGNAL, SLOT} and METHOD, SIGNAL, SLOT to TQ_METHOD, TQ_SIGNAL, TQ_SLOT. This is a temporary step to make sure TDE keeps building while METHOD, SIGNAL, SLOT are renamed in every repository.

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 2ad1beb815994ee2f2cefd31ec76102b880d7768)

3 files changed, 33 insertions, 15 deletions

diff --git a/qtinterface/convert_qt_tqt2 b/qtinterface/convert_qt_tqt2
index d63048c..e07c585 100755
--- a/qtinterface/convert_qt_tqt2
+++ b/qtinterface/convert_qt_tqt2
@@ -979,12 +979,12 @@ find ./ -type f -iname "*.c*" -exec sed -i 's/TTQ/TQ/g' {} \;
 find ./ -type f -iname "*.c*" -exec sed -i 's/TTQ/TQ/g' {} \;
 find ./ -type f -iname "*.c*" -exec sed -i 's/TTQ/TQ/g' {} \;
 
-find ./ -type f -iname "*.c*" -exec sed -i 's/\([^_]\)METHOD\([( ]\)/\1TQT_METHOD\2/g' {} \;
-find ./ -type f -iname "*.h*" -exec sed -i 's/\([^_]\)METHOD\([( ]\)/\1TQT_METHOD\2/g' {} \;
-find ./ -type f -iname "*.c*" -exec sed -i 's/\([^_]\)SLOT\([( ]\)/\1TQT_SLOT\2/g' {} \;
-find ./ -type f -iname "*.h*" -exec sed -i 's/\([^_]\)SLOT\([( ]\)/\1TQT_SLOT\2/g' {} \;
-find ./ -type f -iname "*.c*" -exec sed -i 's/\([^_]\)SIGNAL\([( ]\)/\1TQT_SIGNAL\2/g' {} \;
-find ./ -type f -iname "*.h*" -exec sed -i 's/\([^_]\)SIGNAL\([( ]\)/\1TQT_SIGNAL\2/g' {} \;
+find ./ -type f -iname "*.c*" -exec sed -i 's/\([^_]\)METHOD\([( ]\)/\1TQ_METHOD\2/g' {} \;
+find ./ -type f -iname "*.h*" -exec sed -i 's/\([^_]\)METHOD\([( ]\)/\1TQ_METHOD\2/g' {} \;
+find ./ -type f -iname "*.c*" -exec sed -i 's/\([^_]\)SLOT\([( ]\)/\1TQ_SLOT\2/g' {} \;
+find ./ -type f -iname "*.h*" -exec sed -i 's/\([^_]\)SLOT\([( ]\)/\1TQ_SLOT\2/g' {} \;
+find ./ -type f -iname "*.c*" -exec sed -i 's/\([^_]\)SIGNAL\([( ]\)/\1TQ_SIGNAL\2/g' {} \;
+find ./ -type f -iname "*.h*" -exec sed -i 's/\([^_]\)SIGNAL\([( ]\)/\1TQ_SIGNAL\2/g' {} \;
 
 find ./ -type f -iname "*.h*" -exec sed -i 's/TQT_TQT_/TQT_/g' {} \;
 find ./ -type f -iname "*.h*" -exec sed -i 's/TQT_TQT_/TQT_/g' {} \;
diff --git a/qtinterface/convert_qt_tqt3 b/qtinterface/convert_qt_tqt3
index 0097603..e8172c4 100755
--- a/qtinterface/convert_qt_tqt3
+++ b/qtinterface/convert_qt_tqt3
@@ -967,12 +967,12 @@ find ./ -type f -iname "*.diff*" -exec sed -i 's/TTQ/TQ/g' {} \;
 find ./ -type f -iname "*.diff*" -exec sed -i 's/TTQ/TQ/g' {} \;
 find ./ -type f -iname "*.diff*" -exec sed -i 's/TTQ/TQ/g' {} \;
 
-find ./ -type f -iname "*.patch*" -exec sed -i 's/\([^_]\)METHOD\([( ]\)/\1TQT_METHOD\2/g' {} \;
-find ./ -type f -iname "*.diff*" -exec sed -i 's/\([^_]\)METHOD\([( ]\)/\1TQT_METHOD\2/g' {} \;
-find ./ -type f -iname "*.patch*" -exec sed -i 's/\([^_]\)SLOT\([( ]\)/\1TQT_SLOT\2/g' {} \;
-find ./ -type f -iname "*.diff*" -exec sed -i 's/\([^_]\)SLOT\([( ]\)/\1TQT_SLOT\2/g' {} \;
-find ./ -type f -iname "*.patch*" -exec sed -i 's/\([^_]\)SIGNAL\([( ]\)/\1TQT_SIGNAL\2/g' {} \;
-find ./ -type f -iname "*.diff*" -exec sed -i 's/\([^_]\)SIGNAL\([( ]\)/\1TQT_SIGNAL\2/g' {} \;
+find ./ -type f -iname "*.patch*" -exec sed -i 's/\([^_]\)METHOD\([( ]\)/\1TQ_METHOD\2/g' {} \;
+find ./ -type f -iname "*.diff*" -exec sed -i 's/\([^_]\)METHOD\([( ]\)/\1TQ_METHOD\2/g' {} \;
+find ./ -type f -iname "*.patch*" -exec sed -i 's/\([^_]\)SLOT\([( ]\)/\1TQ_SLOT\2/g' {} \;
+find ./ -type f -iname "*.diff*" -exec sed -i 's/\([^_]\)SLOT\([( ]\)/\1TQ_SLOT\2/g' {} \;
+find ./ -type f -iname "*.patch*" -exec sed -i 's/\([^_]\)SIGNAL\([( ]\)/\1TQ_SIGNAL\2/g' {} \;
+find ./ -type f -iname "*.diff*" -exec sed -i 's/\([^_]\)SIGNAL\([( ]\)/\1TQ_SIGNAL\2/g' {} \;
 
 find ./ -type f -iname "*.patch*" -exec sed -i 's/TQT_TQT_/TQT_/g' {} \;
 find ./ -type f -iname "*.patch*" -exec sed -i 's/TQT_TQT_/TQT_/g' {} \;
diff --git a/qtinterface/tqt.h.cmake b/qtinterface/tqt.h.cmake
index dda4991..53b3cf2 100644
--- a/qtinterface/tqt.h.cmake
+++ b/qtinterface/tqt.h.cmake
@@ -32,10 +32,28 @@ Boston, MA 02110-1301, USA.
 #undef TQT_SIGNAL
 #endif
 
+#ifdef METHOD
+#undef METHOD
+#endif
+#ifdef SLOT
+#undef SLOT
+#endif
+#ifdef SIGNAL
+#undef SIGNAL
+#endif
+
 #ifdef __cplusplus
-#define TQT_METHOD(a)	METHOD(a)
-#define TQT_SLOT(a)	SLOT(a)
-#define TQT_SIGNAL(a)	SIGNAL(a)
+#define TQT_METHOD(a) TQ_METHOD(a)
+#define TQT_SLOT(a)   TQ_SLOT(a)
+#define TQT_SIGNAL(a) TQ_SIGNAL(a)
+
+#define METHOD(a) TQ_METHOD(a)
+#define SLOT(a)   TQ_SLOT(a)
+#define SIGNAL(a) TQ_SIGNAL(a)
+
+#define TQMETHOD_CODE TQ_METHOD_CODE
+#define TQSLOT_CODE   TQ_SLOT_CODE
+#define TQSIGNAL_CODE TQ_SIGNAL_CODE
 #endif /* __cplusplus */