summaryrefslogtreecommitdiffstats
path: root/qtjava
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:17:51 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:17:51 -0600
commit95c43a0f38217a41c246b1b324c92cc2cba78e5e (patch)
treefe11835688057219e383ad91e286490e46f1eff4 /qtjava
parent8a69eba2f0eddce05cf86e0df8aec6e9f473d485 (diff)
downloadtdebindings-95c43a0f38217a41c246b1b324c92cc2cba78e5e.tar.gz
tdebindings-95c43a0f38217a41c246b1b324c92cc2cba78e5e.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'qtjava')
-rw-r--r--qtjava/designer/juic/common/main.xsl2
-rw-r--r--qtjava/designer/juic/java/JavaClasses.xml8
-rw-r--r--qtjava/designer/juic/java/methods.xsl2
3 files changed, 6 insertions, 6 deletions
diff --git a/qtjava/designer/juic/common/main.xsl b/qtjava/designer/juic/common/main.xsl
index 46f15187..4daf282d 100644
--- a/qtjava/designer/juic/common/main.xsl
+++ b/qtjava/designer/juic/common/main.xsl
@@ -97,7 +97,7 @@
<xsl:if test="not($abstract) and $main">
<xsl:choose>
<xsl:when test="$kde">
- <class>KApplication</class>
+ <class>TDEApplication</class>
<class>KCmdLineArgs</class>
</xsl:when>
<xsl:otherwise>
diff --git a/qtjava/designer/juic/java/JavaClasses.xml b/qtjava/designer/juic/java/JavaClasses.xml
index f2275a0e..9b5bd5bd 100644
--- a/qtjava/designer/juic/java/JavaClasses.xml
+++ b/qtjava/designer/juic/java/JavaClasses.xml
@@ -2829,19 +2829,19 @@
</class>
<class>
<package>org.kde.koala</package>
- <name>KApplication</name>
+ <name>TDEApplication</name>
</class>
<class>
<package>org.kde.koala</package>
- <name>KApplicationPropsPlugin</name>
+ <name>TDEApplicationPropsPlugin</name>
</class>
<class>
<package>org.kde.koala</package>
- <name>KApplicationPropsPluginSignals</name>
+ <name>TDEApplicationPropsPluginSignals</name>
</class>
<class>
<package>org.kde.koala</package>
- <name>KApplicationSignals</name>
+ <name>TDEApplicationSignals</name>
</class>
<class>
<package>org.kde.koala</package>
diff --git a/qtjava/designer/juic/java/methods.xsl b/qtjava/designer/juic/java/methods.xsl
index 48b426e7..f2d6c12a 100644
--- a/qtjava/designer/juic/java/methods.xsl
+++ b/qtjava/designer/juic/java/methods.xsl
@@ -52,7 +52,7 @@
<xsl:choose>
<xsl:when test="$kde">
KCmdLineArgs.init( args , "<xsl:value-of select="$mainClass"/>", "<xsl:value-of select="$mainClass"/>", "<xsl:value-of select="java:toJavaString(/UI/widget/property[@name='caption']/string)"/>", "version");
- KApplication app = new KApplication();
+ TDEApplication app = new TDEApplication();
</xsl:when>
<xsl:otherwise>
TQApplication app = new TQApplication(args);