summaryrefslogtreecommitdiffstats
path: root/languages/java
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-22 20:23:50 -0600
committerTimothy Pearson <[email protected]>2013-01-22 20:23:50 -0600
commit3a044decb0a5d7be822c888b2d5374573d7df96e (patch)
treeddf4681e0233c25203fc927596aa7b3bdb5f2efa /languages/java
parent5c0390ebaa2be82d8684af5a6bc2b16740f4cc1b (diff)
downloadtdevelop-3a044decb0a5d7be822c888b2d5374573d7df96e.tar.gz
tdevelop-3a044decb0a5d7be822c888b2d5374573d7df96e.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'languages/java')
-rw-r--r--languages/java/app_templates/kappjava/app.java4
-rw-r--r--languages/java/javasupportfactory.cpp4
-rw-r--r--languages/java/javasupportfactory.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/languages/java/app_templates/kappjava/app.java b/languages/java/app_templates/kappjava/app.java
index 83ebfbf0..5822f563 100644
--- a/languages/java/app_templates/kappjava/app.java
+++ b/languages/java/app_templates/kappjava/app.java
@@ -237,8 +237,8 @@ static String[][] options =
static void main(String[] cmdLineArgs)
{
- KAboutData about = new KAboutData("%{APPNAMELC}", "%{APPNAME}", version, description,
- KAboutData.License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", null, null, "%{EMAIL}");
+ TDEAboutData about = new TDEAboutData("%{APPNAMELC}", "%{APPNAME}", version, description,
+ TDEAboutData.License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", null, null, "%{EMAIL}");
about.addAuthor( "%{AUTHOR}", null, "%{EMAIL}" );
TDECmdLineArgs.init(cmdLineArgs, about);
TDECmdLineArgs.addCmdLineOptions(options);
diff --git a/languages/java/javasupportfactory.cpp b/languages/java/javasupportfactory.cpp
index 92bce808..11823c22 100644
--- a/languages/java/javasupportfactory.cpp
+++ b/languages/java/javasupportfactory.cpp
@@ -22,9 +22,9 @@ JavaSupportFactory::JavaSupportFactory()
{
}
-KInstance *JavaSupportFactory::createInstance()
+TDEInstance *JavaSupportFactory::createInstance()
{
- KInstance *instance = KDevGenericFactory<JavaSupportPart>::createInstance();
+ TDEInstance *instance = KDevGenericFactory<JavaSupportPart>::createInstance();
KStandardDirs *dirs = instance->dirs();
dirs->addResourceType( "newclasstemplates", KStandardDirs::kde_default("data") + "kdevjavasupport/newclass/" );
dirs->addResourceType( "pcs", KStandardDirs::kde_default( "data" ) + "kdevjavasupport/pcs/" );
diff --git a/languages/java/javasupportfactory.h b/languages/java/javasupportfactory.h
index 064b7dd4..785d7fea 100644
--- a/languages/java/javasupportfactory.h
+++ b/languages/java/javasupportfactory.h
@@ -25,7 +25,7 @@ public:
static const KDevPluginInfo *info();
protected:
- virtual KInstance *createInstance();
+ virtual TDEInstance *createInstance();
};
#endif