diff options
Diffstat (limited to 'qtjava/designer/juic')
| -rw-r--r-- | qtjava/designer/juic/common/QtClasses.xml | 9 | ||||
| -rw-r--r-- | qtjava/designer/juic/java/JavaClasses.xml | 12 | ||||
| -rw-r--r-- | qtjava/designer/juic/java/definitions.xsl | 4 | ||||
| -rw-r--r-- | qtjava/designer/juic/java/methods.xsl | 2 | ||||
| -rw-r--r-- | qtjava/designer/juic/java/put.xsl | 6 |
5 files changed, 6 insertions, 27 deletions
diff --git a/qtjava/designer/juic/common/QtClasses.xml b/qtjava/designer/juic/common/QtClasses.xml index 1c02fd7c..d6e7640f 100644 --- a/qtjava/designer/juic/common/QtClasses.xml +++ b/qtjava/designer/juic/common/QtClasses.xml @@ -1119,15 +1119,6 @@ <name>TQScrollViewSignals</name> </class> <class> - <name>TQSemiModalEventHandling</name> - </class> - <class> - <name>TQSemiModal</name> - </class> - <class> - <name>TQSemiModalSignals</name> - </class> - <class> <name>TQServerSocket</name> </class> <class> diff --git a/qtjava/designer/juic/java/JavaClasses.xml b/qtjava/designer/juic/java/JavaClasses.xml index 5400f445..8a2c3c6e 100644 --- a/qtjava/designer/juic/java/JavaClasses.xml +++ b/qtjava/designer/juic/java/JavaClasses.xml @@ -1493,18 +1493,6 @@ </class> <class> <package>org.trinitydesktop.qt</package> - <name>TQSemiModalEventHandling</name> - </class> - <class> - <package>org.trinitydesktop.qt</package> - <name>TQSemiModal</name> - </class> - <class> - <package>org.trinitydesktop.qt</package> - <name>TQSemiModalSignals</name> - </class> - <class> - <package>org.trinitydesktop.qt</package> <name>TQServerSocket</name> </class> <class> 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( "', $signal, '" ), ', + ', TQ_SIGNAL( "', $signal, '" ), ', $receiver, - ', SLOT( "', $slot, '" ));')"/> + ', TQ_SLOT( "', $slot, '" ));')"/> </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> <!-- |