From 1eb017313b2ebc441dfc81e73a5d6573d03ea08d Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Sat, 13 Jan 2024 11:29:06 +0900
Subject: Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit faf33629bb6562a6f43f930afafe4b22e9cdb60b)
---
 qtjava/designer/juic/java/definitions.xsl | 4 ++--
 qtjava/designer/juic/java/methods.xsl     | 2 +-
 qtjava/designer/juic/java/put.xsl         | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'qtjava/designer/juic/java')

diff --git a/qtjava/designer/juic/java/definitions.xsl b/qtjava/designer/juic/java/definitions.xsl
index f04fbd62..94653074 100644
--- a/qtjava/designer/juic/java/definitions.xsl
+++ b/qtjava/designer/juic/java/definitions.xsl
@@ -631,9 +631,9 @@
         </xsl:variable>
         <xsl:value-of select="$nlIndent8"/>
         <xsl:value-of select="concat('connect( ', $sender,
-                                               ', SIGNAL( &quot;', $signal, '&quot; ), ',
+                                               ', TQ_SIGNAL( &quot;', $signal, '&quot; ), ',
                                                   $receiver,
-                                               ', SLOT( &quot;', $slot, '&quot; ));')"/>
+                                               ', TQ_SLOT( &quot;', $slot, '&quot; ));')"/>
     </xsl:template>
     
 </xsl:stylesheet>
diff --git a/qtjava/designer/juic/java/methods.xsl b/qtjava/designer/juic/java/methods.xsl
index b9e27e52..c8573a5e 100644
--- a/qtjava/designer/juic/java/methods.xsl
+++ b/qtjava/designer/juic/java/methods.xsl
@@ -156,7 +156,7 @@
     <xsl:template name="putLanguageChangeSlot">
 
     /**
-     * SLOT
+     * TQ_SLOT
      * languageChange sets the strings according to current language
      */
    protected void languageChange() {
diff --git a/qtjava/designer/juic/java/put.xsl b/qtjava/designer/juic/java/put.xsl
index 884321dc..1bb36ddb 100644
--- a/qtjava/designer/juic/java/put.xsl
+++ b/qtjava/designer/juic/java/put.xsl
@@ -411,7 +411,7 @@
         </xsl:if>
         <xsl:message>Generating slot "<xsl:value-of select="$method"/></xsl:message>
     /**
-     * SLOT <xsl:value-of select="$method"/>
+     * TQ_SLOT <xsl:value-of select="$method"/>
      */
     <xsl:choose>
         <xsl:when test="$abstract">
@@ -419,7 +419,7 @@
         </xsl:when>
         <xsl:otherwise>
     <xsl:value-of select="$method"/> {
-        tqWarning("Warning: SLOT \"<xsl:value-of select="$method"/>\" must be overridden");
+        tqWarning("Warning: TQ_SLOT \"<xsl:value-of select="$method"/>\" must be overridden");
         <xsl:if test="not($return = 'void')">
         <xsl:choose>
             <xsl:when test="$return = 'byte' or $return = 'short' or $return = 'int' or $return = 'long'">
@@ -447,7 +447,7 @@
     <xsl:template name="putSignal">
         <xsl:param name="data"/>
         <xsl:variable name="sig" select="java:cpp-to-java-signature(.)"/>
-    /** SIGNAL <xsl:value-of select="."/> */
+    /** TQ_SIGNAL <xsl:value-of select="."/> */
     </xsl:template>
     
     <!--
-- 
cgit v1.2.3