From 93673b22d293f5bd5b2f90170756b499f534d9b5 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Wed, 6 Sep 2023 12:46:20 +0900
Subject: Replace various Q_* and QT_* defines with TQ_* and TQT_*

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
---
 kalyptus/kalyptus                  | 6 +++---
 kalyptus/kalyptusCxxToCSharp.pm    | 4 ++--
 qtsharp/src/api/qt.xml             | 2 +-
 qtsharp/src/generator/TQTypeMap.cs | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/kalyptus/kalyptus b/kalyptus/kalyptus
index 427c401c..4610e507 100644
--- a/kalyptus/kalyptus
+++ b/kalyptus/kalyptus
@@ -134,7 +134,7 @@ $allowed_k_dcop_accesors_re = join("|", @allowed_k_dcop_accesors);
     QT_STATIC_CONST => 'static const',
     Q_EXPORT => '',
     Q_EXPORT_CODECS_BIG5 => '',
-    Q_REFCOUNT => '',
+    TQ_REFCOUNT => '',
     TQM_EXPORT_CANVAS => '',
     TQM_EXPORT_DNS => '',
     TQM_EXPORT_ICONVIEW => '',
@@ -558,7 +558,7 @@ LOOP:
                         || $p =~ /^\s*Q_GADGET/
                         || $p =~ /^\s*TQ_OVERRIDE/       # and TQ_OVERRIDE
                         || $p =~ /^\s*TQ_SETS/
-                        || $p =~ /^\s*Q_DUMMY_COMPARISON_OPERATOR/
+                        || $p =~ /^\s*TQ_DUMMY_COMPARISON_OPERATOR/
                         || $p =~ /^\s*K_SYCOCATYPE/     # and K_SYCOCA stuff
                         || $p =~ /^\s*K_SYCOCAFACTORY/  #
                         || $p =~ /^\s*KSVG_/            # and KSVG stuff ;)
@@ -877,7 +877,7 @@ sub identifyDecl
 					(?:\s*TQ[A-Z_]*EXPORT[A-Z_]*)?
 					(?:\s*Q[A-Z_]*EXPORT[A-Z_]*)?
 					(?:\s*TQ_PACKED)?
-					(?:\s*Q_REFCOUNT)?
+					(?:\s*TQ_REFCOUNT)?
 					\s+([\w_]+                        # 3 name
 							(?:<[\w_ :,]+?>)?		  # maybe explicit template
 									#    (eat chars between <> non-hungry)
diff --git a/kalyptus/kalyptusCxxToCSharp.pm b/kalyptus/kalyptusCxxToCSharp.pm
index 6c8ce4cb..d077fb59 100644
--- a/kalyptus/kalyptusCxxToCSharp.pm
+++ b/kalyptus/kalyptusCxxToCSharp.pm
@@ -117,7 +117,7 @@ sub cplusplusToCSharp
 		return "IntPtr";
 	} elsif ( $cplusplusType =~ /^TQUuid/ ) {
 		return "IntPtr";
-	} elsif ( $cplusplusType =~ /^Q_REFCOUNT/ ) {
+	} elsif ( $cplusplusType =~ /^TQ_REFCOUNT/ ) {
 		return "IntPtr";
 	} elsif ( $cplusplusType =~ /^EventRef/ ) {
 		return "IntPtr";
@@ -223,7 +223,7 @@ sub cplusplusToPInvoke
 		return "RawObject";
 	} elsif ( $cplusplusType =~ /^TQUuid/ ) {
 		return "RawObject";
-	} elsif ( $cplusplusType =~ /^Q_REFCOUNT/ ) {
+	} elsif ( $cplusplusType =~ /^TQ_REFCOUNT/ ) {
 		return "RawObject";
 	} elsif ( $cplusplusType =~ /^EventRef/ ) {
 		return "RawObject";
diff --git a/qtsharp/src/api/qt.xml b/qtsharp/src/api/qt.xml
index 744f0925..9cf58705 100644
--- a/qtsharp/src/api/qt.xml
+++ b/qtsharp/src/api/qt.xml
@@ -305,7 +305,7 @@
     <qparam type="TQUuidamp" name="arg1"/>
     <qparam type="TQUnknownInterface**" name="arg2"/>
   </qmethod>
-  <qmethod name="isValid" access="public" return="Q_REFCOUNT bool" id="0"/>
+  <qmethod name="isValid" access="public" return="TQ_REFCOUNT bool" id="0"/>
   <qmethod name="protected_object" access="protected" return="TQObject*" id="0"/>
 </qtype> <qtype name="TQAction" access="public">
   <qancestor name="TQObject"/>
diff --git a/qtsharp/src/generator/TQTypeMap.cs b/qtsharp/src/generator/TQTypeMap.cs
index b2f71dac..3acda3c7 100644
--- a/qtsharp/src/generator/TQTypeMap.cs
+++ b/qtsharp/src/generator/TQTypeMap.cs
@@ -59,7 +59,7 @@ namespace QtCSharp {
 			mastermap.Add ("HPALETTE", "uint");
 			mastermap.Add ("HRGN", "uint");
 			mastermap.Add ("Display", "IntPtr");
-			mastermap.Add ("Q_REFCOUNT bool", "bool");
+			mastermap.Add ("TQ_REFCOUNT bool", "bool");
 			mastermap.Add ("EventRef", "IntPtr");
 			mastermap.Add ("MSG", "IntPtr");
 			mastermap.Add ("XEvent", "IntPtr");
-- 
cgit v1.2.1