summaryrefslogtreecommitdiffstats
path: root/languages/java
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2014-05-25 15:37:31 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2014-05-25 15:37:31 +0900
commit6392f5a9dfce2bf83617d49bb7f332181ec6004e (patch)
treeab69e390f7962b7e7dda1a3a64f035c61c751cf4 /languages/java
parentaba2788b428dc53243407902e9ccbb20b97a69fd (diff)
downloadtdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.tar.gz
tdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.zip
Revert "Finish renaming tdevelop components"
This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73.
Diffstat (limited to 'languages/java')
-rw-r--r--languages/java/CMakeLists.txt14
-rw-r--r--languages/java/KDevJavaSupportIface.cpp24
-rw-r--r--languages/java/KDevJavaSupportIface.h (renamed from languages/java/TDevJavaSupportIface.h)10
-rw-r--r--languages/java/Makefile.am16
-rw-r--r--languages/java/TDevJavaSupportIface.cpp24
-rw-r--r--languages/java/app_templates/CMakeLists.txt2
-rw-r--r--languages/java/app_templates/Makefile.am2
-rw-r--r--languages/java/app_templates/java.appwizard2
-rw-r--r--languages/java/app_templates/javahello/CMakeLists.txt6
-rw-r--r--languages/java/app_templates/javahello/Makefile.am4
-rw-r--r--languages/java/app_templates/javahello/javahello.filelist2
-rw-r--r--languages/java/app_templates/javahello/javahello.kdevtemplate (renamed from languages/java/app_templates/javahello/javahello.tdevtemplate)0
-rw-r--r--languages/java/app_templates/javahello/javahello.tdevelop14
-rw-r--r--languages/java/app_templates/kappjava/CMakeLists.txt26
-rw-r--r--languages/java/app_templates/kappjava/Makefile.am (renamed from languages/java/app_templates/tdeappjava/Makefile.am)8
-rw-r--r--languages/java/app_templates/kappjava/app.desktop (renamed from languages/java/app_templates/tdeappjava/app.desktop)0
-rw-r--r--languages/java/app_templates/kappjava/app.java (renamed from languages/java/app_templates/tdeappjava/app.java)0
-rw-r--r--languages/java/app_templates/kappjava/app.tdevelop (renamed from languages/java/app_templates/tdeappjava/app.tdevelop)20
-rw-r--r--languages/java/app_templates/kappjava/app_client.java (renamed from languages/java/app_templates/tdeappjava/app_client.java)0
-rw-r--r--languages/java/app_templates/kappjava/appui.rc (renamed from languages/java/app_templates/tdeappjava/appui.rc)0
-rw-r--r--languages/java/app_templates/kappjava/appview.java (renamed from languages/java/app_templates/tdeappjava/appview.java)0
-rw-r--r--languages/java/app_templates/kappjava/kappjava (renamed from languages/java/app_templates/tdeappjava/tdeappjava)2
-rw-r--r--languages/java/app_templates/kappjava/kappjava.kdevtemplate (renamed from languages/java/app_templates/tdeappjava/tdeappjava.tdevtemplate)10
-rw-r--r--languages/java/app_templates/kappjava/kappjava.png (renamed from languages/java/app_templates/tdeappjava/tdeappjava.png)bin5063 -> 5063 bytes
-rw-r--r--languages/java/app_templates/kappjava/pref.java (renamed from languages/java/app_templates/tdeappjava/pref.java)0
-rw-r--r--languages/java/app_templates/kappjava/src-Makefile.am (renamed from languages/java/app_templates/tdeappjava/src-Makefile.am)0
-rw-r--r--languages/java/app_templates/kappjava/subdirs (renamed from languages/java/app_templates/tdeappjava/subdirs)0
-rw-r--r--languages/java/app_templates/superwaba/CMakeLists.txt6
-rw-r--r--languages/java/app_templates/superwaba/Makefile.am4
-rw-r--r--languages/java/app_templates/superwaba/superwaba.kdevtemplate (renamed from languages/java/app_templates/superwaba/superwaba.tdevtemplate)2
-rw-r--r--languages/java/app_templates/superwaba/sw.tdevelop20
-rw-r--r--languages/java/app_templates/tdeappjava/CMakeLists.txt26
-rw-r--r--languages/java/backgroundparser.cpp10
-rw-r--r--languages/java/backgroundparser.h2
-rw-r--r--languages/java/doc/CMakeLists.txt2
-rw-r--r--languages/java/doc/Makefile.am2
-rw-r--r--languages/java/file_templates/CMakeLists.txt2
-rw-r--r--languages/java/file_templates/Makefile.am2
-rw-r--r--languages/java/javasupport_events.h2
-rw-r--r--languages/java/javasupportfactory.cpp16
-rw-r--r--languages/java/javasupportfactory.h8
-rw-r--r--languages/java/javasupportpart.cpp30
-rw-r--r--languages/java/javasupportpart.h10
-rw-r--r--languages/java/kdevdeepcopy.h (renamed from languages/java/tdevdeepcopy.h)4
-rw-r--r--languages/java/kdevdriver.cpp (renamed from languages/java/tdevdriver.cpp)10
-rw-r--r--languages/java/kdevdriver.h (renamed from languages/java/tdevdriver.h)10
-rw-r--r--languages/java/kdevjavasupport.desktop (renamed from languages/java/tdevjavasupport.desktop)4
-rw-r--r--languages/java/kdevjavasupport.rc (renamed from languages/java/tdevjavasupport.rc)2
-rw-r--r--languages/java/newclass_templates/Makefile.am2
-rw-r--r--languages/java/problemreporter.cpp4
50 files changed, 183 insertions, 183 deletions
diff --git a/languages/java/CMakeLists.txt b/languages/java/CMakeLists.txt
index 546c6ac9..d3f7f5a7 100644
--- a/languages/java/CMakeLists.txt
+++ b/languages/java/CMakeLists.txt
@@ -35,20 +35,20 @@ link_directories(
##### other data ################################
-install( FILES tdevjavasupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES tdevjavasupport.rc DESTINATION ${DATA_INSTALL_DIR}/tdevjavasupport )
+install( FILES kdevjavasupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevjavasupport.rc DESTINATION ${DATA_INSTALL_DIR}/kdevjavasupport )
-##### libtdevjavasupport (module) ###############
+##### libkdevjavasupport (module) ###############
-tde_add_kpart( libtdevjavasupport AUTOMOC
+tde_add_kpart( libkdevjavasupport AUTOMOC
SOURCES
- JavaLexer.cpp TDevJavaSupportIface.cpp
+ JavaLexer.cpp KDevJavaSupportIface.cpp
javasupportfactory.cpp JavaRecognizer.cpp
backgroundparser.cpp configproblemreporter.ui
javasupportpart.cpp JavaStoreWalker.cpp
javasupport_utils.cpp problemreporter.cpp driver.cpp
- tdevdriver.cpp TDevJavaSupportIface.skel
- LINK antlr-static tdevcatalog-shared tdevelop-shared
+ kdevdriver.cpp KDevJavaSupportIface.skel
+ LINK antlr-static kdevcatalog-shared tdevelop-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/languages/java/KDevJavaSupportIface.cpp b/languages/java/KDevJavaSupportIface.cpp
new file mode 100644
index 00000000..b1225700
--- /dev/null
+++ b/languages/java/KDevJavaSupportIface.cpp
@@ -0,0 +1,24 @@
+
+#include "KDevJavaSupportIface.h"
+#include "javasupportpart.h"
+
+KDevJavaSupportIface::KDevJavaSupportIface( JavaSupportPart* javaSupport )
+ : TQObject( javaSupport ), DCOPObject( "KDevJavaSupport" ), m_javaSupport( javaSupport )
+{
+}
+
+KDevJavaSupportIface::~KDevJavaSupportIface()
+{
+}
+
+void KDevJavaSupportIface::addClass()
+{
+ m_javaSupport->slotNewClass();
+}
+
+void KDevJavaSupportIface::parseProject()
+{
+ m_javaSupport->parseProject();
+}
+
+#include "KDevJavaSupportIface.moc"
diff --git a/languages/java/TDevJavaSupportIface.h b/languages/java/KDevJavaSupportIface.h
index 9732ca51..d0c4d441 100644
--- a/languages/java/TDevJavaSupportIface.h
+++ b/languages/java/KDevJavaSupportIface.h
@@ -1,20 +1,20 @@
-#ifndef TDEVJAVASUPPORTIFACE_H
-#define TDEVJAVASUPPORTIFACE_H
+#ifndef KDEVJAVASUPPORTIFACE_H
+#define KDEVJAVASUPPORTIFACE_H
#include <tqobject.h>
#include <dcopobject.h>
class JavaSupportPart;
-class TDevJavaSupportIface : public TQObject, public DCOPObject
+class KDevJavaSupportIface : public TQObject, public DCOPObject
{
Q_OBJECT
//
K_DCOP
public:
- TDevJavaSupportIface( JavaSupportPart* javaSupport );
- ~TDevJavaSupportIface();
+ KDevJavaSupportIface( JavaSupportPart* javaSupport );
+ ~KDevJavaSupportIface();
k_dcop:
void addClass();
diff --git a/languages/java/Makefile.am b/languages/java/Makefile.am
index 8e19da19..a1a1e812 100644
--- a/languages/java/Makefile.am
+++ b/languages/java/Makefile.am
@@ -10,13 +10,13 @@ INCLUDES = -I$(top_srcdir)/lib/antlr -I$(top_srcdir)/lib/catalog \
-I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/interfaces/external -I$(top_srcdir)/lib/util \
$(all_includes)
-kde_module_LTLIBRARIES = libtdevjavasupport.la
-libtdevjavasupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevjavasupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/antlr/src/libantlr.la $(top_builddir)/lib/catalog/libtdevcatalog.la
+kde_module_LTLIBRARIES = libkdevjavasupport.la
+libkdevjavasupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevjavasupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/antlr/src/libantlr.la $(top_builddir)/lib/catalog/libkdevcatalog.la
-libtdevjavasupport_la_SOURCES = JavaLexer.cpp TDevJavaSupportIface.cpp javasupportfactory.cpp \
+libkdevjavasupport_la_SOURCES = JavaLexer.cpp KDevJavaSupportIface.cpp javasupportfactory.cpp \
JavaRecognizer.cpp backgroundparser.cpp configproblemreporter.ui javasupportpart.cpp \
-JavaStoreWalker.cpp javasupport_utils.cpp problemreporter.cpp driver.cpp tdevdriver.cpp TDevJavaSupportIface.skel
+JavaStoreWalker.cpp javasupport_utils.cpp problemreporter.cpp driver.cpp kdevdriver.cpp KDevJavaSupportIface.skel
EXTRA_DIST = java.g java.tree.g java.store.g
@@ -31,7 +31,7 @@ EXTRA_DIST = java.g java.tree.g java.store.g
METASOURCES = AUTO
servicedir = $(kde_servicesdir)
-service_DATA = tdevjavasupport.desktop
+service_DATA = kdevjavasupport.desktop
-rcdir = $(kde_datadir)/tdevjavasupport
-rc_DATA = tdevjavasupport.rc
+rcdir = $(kde_datadir)/kdevjavasupport
+rc_DATA = kdevjavasupport.rc
diff --git a/languages/java/TDevJavaSupportIface.cpp b/languages/java/TDevJavaSupportIface.cpp
deleted file mode 100644
index b9847558..00000000
--- a/languages/java/TDevJavaSupportIface.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-
-#include "TDevJavaSupportIface.h"
-#include "javasupportpart.h"
-
-TDevJavaSupportIface::TDevJavaSupportIface( JavaSupportPart* javaSupport )
- : TQObject( javaSupport ), DCOPObject( "TDevJavaSupport" ), m_javaSupport( javaSupport )
-{
-}
-
-TDevJavaSupportIface::~TDevJavaSupportIface()
-{
-}
-
-void TDevJavaSupportIface::addClass()
-{
- m_javaSupport->slotNewClass();
-}
-
-void TDevJavaSupportIface::parseProject()
-{
- m_javaSupport->parseProject();
-}
-
-#include "TDevJavaSupportIface.moc"
diff --git a/languages/java/app_templates/CMakeLists.txt b/languages/java/app_templates/CMakeLists.txt
index 34cc305c..f7e7d242 100644
--- a/languages/java/app_templates/CMakeLists.txt
+++ b/languages/java/app_templates/CMakeLists.txt
@@ -10,7 +10,7 @@
#################################################
add_subdirectory( javahello )
-add_subdirectory( tdeappjava )
+add_subdirectory( kappjava )
add_subdirectory( superwaba )
install( FILES
diff --git a/languages/java/app_templates/Makefile.am b/languages/java/app_templates/Makefile.am
index f30aefdb..fe3931a3 100644
--- a/languages/java/app_templates/Makefile.am
+++ b/languages/java/app_templates/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = javahello tdeappjava superwaba
+SUBDIRS = javahello kappjava superwaba
profilesdir = $(kde_datadir)/tdevelop/profiles/IDE/CompiledLanguageIDE/JavaIDE
profiles_DATA = java.appwizard
diff --git a/languages/java/app_templates/java.appwizard b/languages/java/app_templates/java.appwizard
index f4f8d6ba..087d6c0c 100644
--- a/languages/java/app_templates/java.appwizard
+++ b/languages/java/app_templates/java.appwizard
@@ -1,2 +1,2 @@
[General]
-List=javahello,tdeappjava,superwaba
+List=javahello,kappjava,superwaba
diff --git a/languages/java/app_templates/javahello/CMakeLists.txt b/languages/java/app_templates/javahello/CMakeLists.txt
index 04fd4963..8129bbc1 100644
--- a/languages/java/app_templates/javahello/CMakeLists.txt
+++ b/languages/java/app_templates/javahello/CMakeLists.txt
@@ -17,9 +17,9 @@ add_custom_target( javahello.tar.gz ALL
install( FILES
${CMAKE_CURRENT_BINARY_DIR}/javahello.tar.gz javahello.png
- DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
+ DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
install( FILES
- javahello.tdevtemplate
- DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
+ javahello.kdevtemplate
+ DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
diff --git a/languages/java/app_templates/javahello/Makefile.am b/languages/java/app_templates/javahello/Makefile.am
index e3e3be27..f47e7056 100644
--- a/languages/java/app_templates/javahello/Makefile.am
+++ b/languages/java/app_templates/javahello/Makefile.am
@@ -2,10 +2,10 @@ dataFiles = Main.java build.xml javahello.filelist javahello.tdevelop
templateName= javahello
### no need to change below:
-template_DATA = $(templateName).tdevtemplate
+template_DATA = $(templateName).kdevtemplate
templatedir = ${appwizarddatadir}/templates
-appwizarddatadir = ${kde_datadir}/tdevappwizard
+appwizarddatadir = ${kde_datadir}/kdevappwizard
$(templateName).tar.gz: ${dataFiles}
$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/java/app_templates/javahello/javahello.filelist b/languages/java/app_templates/javahello/javahello.filelist
index b9ce43ab..97da44be 100644
--- a/languages/java/app_templates/javahello/javahello.filelist
+++ b/languages/java/app_templates/javahello/javahello.filelist
@@ -1,2 +1,2 @@
-# TDevelop Custom Project File List
+# KDevelop Custom Project File List
Main.java
diff --git a/languages/java/app_templates/javahello/javahello.tdevtemplate b/languages/java/app_templates/javahello/javahello.kdevtemplate
index 62fcffc5..62fcffc5 100644
--- a/languages/java/app_templates/javahello/javahello.tdevtemplate
+++ b/languages/java/app_templates/javahello/javahello.kdevtemplate
diff --git a/languages/java/app_templates/javahello/javahello.tdevelop b/languages/java/app_templates/javahello/javahello.tdevelop
index ade81a9a..a41fae72 100644
--- a/languages/java/app_templates/javahello/javahello.tdevelop
+++ b/languages/java/app_templates/javahello/javahello.tdevelop
@@ -7,15 +7,15 @@
<projectmanagement>KDevAntProject</projectmanagement>
<primarylanguage>Java</primarylanguage>
<ignoreparts>
- <part>TDevDebugger</part>
+ <part>KDevDebugger</part>
</ignoreparts>
</general>
- <tdevcustomproject>
+ <kdevcustomproject>
<build>
<buildtool>ant</buildtool>
</build>
- </tdevcustomproject>
- <tdevdoctreeview>
+ </kdevcustomproject>
+ <kdevdoctreeview>
<ignoretocs>
<toc>ada</toc>
<toc>ada_bugs_gcc</toc>
@@ -59,11 +59,11 @@
<ignoredoxygen>
<toc>KDE Libraries (Doxygen)</toc>
</ignoredoxygen>
- </tdevdoctreeview>
- <tdevfileview>
+ </kdevdoctreeview>
+ <kdevfileview>
<tree>
<hidenonprojectfiles>false</hidenonprojectfiles>
<hidepatterns>*.o,*.lo,CVS</hidepatterns>
</tree>
- </tdevfileview>
+ </kdevfileview>
</tdevelop>
diff --git a/languages/java/app_templates/kappjava/CMakeLists.txt b/languages/java/app_templates/kappjava/CMakeLists.txt
new file mode 100644
index 00000000..042872fd
--- /dev/null
+++ b/languages/java/app_templates/kappjava/CMakeLists.txt
@@ -0,0 +1,26 @@
+#################################################
+#
+# (C) 2010-2011 Serghei Amelian
+# serghei (DOT) amelian (AT) gmail.com
+#
+# Improvements and feedback are welcome
+#
+# This file is released under GPL >= 2
+#
+#################################################
+
+add_custom_target( kappjava.tar.gz ALL
+ COMMAND tar zcf kappjava.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
+ app.java pref.java appview.java app_client.java appui.rc
+ src-Makefile.am kappjava.png app.tdevelop subdirs
+)
+
+
+install( FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/kappjava.tar.gz kappjava.png
+ DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+
+
+install( FILES
+ kappjava.kdevtemplate
+ DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
diff --git a/languages/java/app_templates/tdeappjava/Makefile.am b/languages/java/app_templates/kappjava/Makefile.am
index 889abb5a..edbd4468 100644
--- a/languages/java/app_templates/tdeappjava/Makefile.am
+++ b/languages/java/app_templates/kappjava/Makefile.am
@@ -1,12 +1,12 @@
dataFiles = app.java pref.java appview.java app_client.java appui.rc \
- src-Makefile.am tdeappjava.png app.tdevelop subdirs
-templateName = tdeappjava
+ src-Makefile.am kappjava.png app.tdevelop subdirs
+templateName = kappjava
### no need to change below:
-template_DATA = $(templateName).tdevtemplate
+template_DATA = $(templateName).kdevtemplate
templatedir = ${appwizarddatadir}/templates
-appwizarddatadir = ${kde_datadir}/tdevappwizard
+appwizarddatadir = ${kde_datadir}/kdevappwizard
$(templateName).tar.gz: ${dataFiles}
$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/java/app_templates/tdeappjava/app.desktop b/languages/java/app_templates/kappjava/app.desktop
index 3cc75ad8..3cc75ad8 100644
--- a/languages/java/app_templates/tdeappjava/app.desktop
+++ b/languages/java/app_templates/kappjava/app.desktop
diff --git a/languages/java/app_templates/tdeappjava/app.java b/languages/java/app_templates/kappjava/app.java
index 40bc6b93..40bc6b93 100644
--- a/languages/java/app_templates/tdeappjava/app.java
+++ b/languages/java/app_templates/kappjava/app.java
diff --git a/languages/java/app_templates/tdeappjava/app.tdevelop b/languages/java/app_templates/kappjava/app.tdevelop
index 1e07dec0..7ee74558 100644
--- a/languages/java/app_templates/tdeappjava/app.tdevelop
+++ b/languages/java/app_templates/kappjava/app.tdevelop
@@ -13,15 +13,15 @@
<keyword>KDE</keyword>
</keywords>
</general>
- <tdevautoproject>
+ <kdevautoproject>
<general>
<activetarget>src/java</activetarget>
</general>
<run>
<mainprogram>src/%{APPNAMELC}</mainprogram>
</run>
- </tdevautoproject>
- <tdevfileview>
+ </kdevautoproject>
+ <kdevfileview>
<groups>
<group pattern="*.java" name="Sources" />
<group pattern="*.ui" name="User Interface" />
@@ -29,12 +29,12 @@
<group pattern="*.po;*.ts" name="Translations" />
<group pattern="*" name="Others" />
</groups>
- </tdevfileview>
- <tdevdebugger>
+ </kdevfileview>
+ <kdevdebugger>
<general>
</general>
- </tdevdebugger>
- <tdevdoctreeview>
+ </kdevdebugger>
+ <kdevdoctreeview>
<ignoretocs>
<toc>ada</toc>
<toc>ada_bugs_gcc</toc>
@@ -79,10 +79,10 @@
<ignoredoxygen>
<toc>KDE Libraries (Doxygen)</toc>
</ignoredoxygen>
- </tdevdoctreeview>
- <tdevfilecreate>
+ </kdevdoctreeview>
+ <kdevfilecreate>
<useglobaltypes>
<type ext="java"/>
</useglobaltypes>
- </tdevfilecreate>
+ </kdevfilecreate>
</tdevelop>
diff --git a/languages/java/app_templates/tdeappjava/app_client.java b/languages/java/app_templates/kappjava/app_client.java
index 9648cfad..9648cfad 100644
--- a/languages/java/app_templates/tdeappjava/app_client.java
+++ b/languages/java/app_templates/kappjava/app_client.java
diff --git a/languages/java/app_templates/tdeappjava/appui.rc b/languages/java/app_templates/kappjava/appui.rc
index ceb4f14e..ceb4f14e 100644
--- a/languages/java/app_templates/tdeappjava/appui.rc
+++ b/languages/java/app_templates/kappjava/appui.rc
diff --git a/languages/java/app_templates/tdeappjava/appview.java b/languages/java/app_templates/kappjava/appview.java
index 347ff58f..347ff58f 100644
--- a/languages/java/app_templates/tdeappjava/appview.java
+++ b/languages/java/app_templates/kappjava/appview.java
diff --git a/languages/java/app_templates/tdeappjava/tdeappjava b/languages/java/app_templates/kappjava/kappjava
index a62edafa..e199ac25 100644
--- a/languages/java/app_templates/tdeappjava/tdeappjava
+++ b/languages/java/app_templates/kappjava/kappjava
@@ -2,7 +2,7 @@
[General]
Name=Application framework
Name[fr]=Squelette d'application
-Icon=tdeappjava.png
+Icon=kappjava.png
Category=Java/KDE
Comment=Generates a simple Java KDE application with one toplevel window, menus and toolbars.
Comment[fr]=Gnre une simple application KDE dans le language JAVA avec une fentre principale, des menus, et des barres d'outils.
diff --git a/languages/java/app_templates/tdeappjava/tdeappjava.tdevtemplate b/languages/java/app_templates/kappjava/kappjava.kdevtemplate
index b5b35e33..92cf4710 100644
--- a/languages/java/app_templates/tdeappjava/tdeappjava.tdevtemplate
+++ b/languages/java/app_templates/kappjava/kappjava.kdevtemplate
@@ -30,7 +30,7 @@ Name[sv]=Programramverk
Name[tr]=Uygulama Çatısı
Name[zh_CN]=应用程序框架
Name[zh_TW]=應用程式框架
-Icon=tdeappjava.png
+Icon=kappjava.png
Category=Java/KDE
Comment=Generates a simple Java KDE application with one toplevel window, menus and toolbars.
Comment[ca]=Genera una simple aplicació per al KDE en Java amb una finestra principal, menús i barres d'eines.
@@ -61,19 +61,19 @@ Comment[zh_CN]=生成一个简单的带有顶级窗口、菜单和工具栏的 J
Comment[zh_TW]=產生一個簡單的 Java KDE 應用程式,內含頂層視窗、選單與工具列。
FileTemplates=java,CStyle
ShowFilesAfterGeneration=%{dest}/src/%{APPNAME}View.java
-Archive=tdeappjava.tar.gz
+Archive=kappjava.tar.gz
[ADMIN]
Type=include
-File=%{tdevelop}/template-common/admin.tdevtemplate
+File=%{tdevelop}/template-common/admin.kdevtemplate
[GNU]
Type=include
-File=%{tdevelop}/template-common/gnu.tdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
[DOCBOOK]
Type=include
-File=%{tdevelop}/template-common/dockbook.tdevtemplate
+File=%{tdevelop}/template-common/dockbook.kdevtemplate
[FILE4]
Type=install
diff --git a/languages/java/app_templates/tdeappjava/tdeappjava.png b/languages/java/app_templates/kappjava/kappjava.png
index 913ebb87..913ebb87 100644
--- a/languages/java/app_templates/tdeappjava/tdeappjava.png
+++ b/languages/java/app_templates/kappjava/kappjava.png
Binary files differ
diff --git a/languages/java/app_templates/tdeappjava/pref.java b/languages/java/app_templates/kappjava/pref.java
index a50fdb31..a50fdb31 100644
--- a/languages/java/app_templates/tdeappjava/pref.java
+++ b/languages/java/app_templates/kappjava/pref.java
diff --git a/languages/java/app_templates/tdeappjava/src-Makefile.am b/languages/java/app_templates/kappjava/src-Makefile.am
index 6468994c..6468994c 100644
--- a/languages/java/app_templates/tdeappjava/src-Makefile.am
+++ b/languages/java/app_templates/kappjava/src-Makefile.am
diff --git a/languages/java/app_templates/tdeappjava/subdirs b/languages/java/app_templates/kappjava/subdirs
index 0e678106..0e678106 100644
--- a/languages/java/app_templates/tdeappjava/subdirs
+++ b/languages/java/app_templates/kappjava/subdirs
diff --git a/languages/java/app_templates/superwaba/CMakeLists.txt b/languages/java/app_templates/superwaba/CMakeLists.txt
index ea9517be..58932352 100644
--- a/languages/java/app_templates/superwaba/CMakeLists.txt
+++ b/languages/java/app_templates/superwaba/CMakeLists.txt
@@ -17,9 +17,9 @@ add_custom_target( superwaba.tar.gz ALL
install( FILES
${CMAKE_CURRENT_BINARY_DIR}/superwaba.tar.gz superwaba.png
- DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
+ DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
install( FILES
- superwaba.tdevtemplate
- DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
+ superwaba.kdevtemplate
+ DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
diff --git a/languages/java/app_templates/superwaba/Makefile.am b/languages/java/app_templates/superwaba/Makefile.am
index c9c6aa99..bc706fe6 100644
--- a/languages/java/app_templates/superwaba/Makefile.am
+++ b/languages/java/app_templates/superwaba/Makefile.am
@@ -2,10 +2,10 @@ dataFiles = superwaba.png sw.java src-Makefile sw.tdevelop sw.filelist
templateName = superwaba
### no need to change below:
-template_DATA = $(templateName).tdevtemplate
+template_DATA = $(templateName).kdevtemplate
templatedir = ${appwizarddatadir}/templates
-appwizarddatadir = ${kde_datadir}/tdevappwizard
+appwizarddatadir = ${kde_datadir}/kdevappwizard
$(templateName).tar.gz: ${dataFiles}
$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/java/app_templates/superwaba/superwaba.tdevtemplate b/languages/java/app_templates/superwaba/superwaba.kdevtemplate
index e792af35..27257770 100644
--- a/languages/java/app_templates/superwaba/superwaba.tdevtemplate
+++ b/languages/java/app_templates/superwaba/superwaba.kdevtemplate
@@ -162,5 +162,5 @@ Archive=superwaba.tar.gz
[GNU]
Type=include
-File=%{tdevelop}/template-common/gnu.tdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
diff --git a/languages/java/app_templates/superwaba/sw.tdevelop b/languages/java/app_templates/superwaba/sw.tdevelop
index 029d3af3..11db7411 100644
--- a/languages/java/app_templates/superwaba/sw.tdevelop
+++ b/languages/java/app_templates/superwaba/sw.tdevelop
@@ -4,17 +4,17 @@
<author>%{AUTHOR}</author>
<email>%{EMAIL}</email>
<version>%{VERSION}</version>
- <projectmanagement>TDevCustomProject</projectmanagement>
+ <projectmanagement>KDevCustomProject</projectmanagement>
<primarylanguage>Java</primarylanguage>
<ignoreparts>
- <part>TDevDebugger</part>
+ <part>KDevDebugger</part>
</ignoreparts>
<keywords>
<keyword>Java</keyword>
<keyword>Code</keyword>
</keywords>
</general>
- <tdevcustomproject>
+ <kdevcustomproject>
<run>
<mainprogram>make test</mainprogram>
<programargs/>
@@ -34,14 +34,14 @@
<envvars/>
</make>
<makeenvvars/>
- </tdevcustomproject>
- <tdevfileview>
+ </kdevcustomproject>
+ <kdevfileview>
<groups>
<group pattern="Makefile" name="Build" />
<group pattern="*.java" name="Source" />
</groups>
- </tdevfileview>
- <tdevdoctreeview>
+ </kdevfileview>
+ <kdevdoctreeview>
<ignoretocs>
<toc>bash</toc>
<toc>bash_bugs</toc>
@@ -85,10 +85,10 @@
<ignoredoxygen>
<toc>KDE Libraries (Doxygen)</toc>
</ignoredoxygen>
- </tdevdoctreeview>
- <tdevfilecreate>
+ </kdevdoctreeview>
+ <kdevfilecreate>
<useglobaltypes>
<type ext="java"/>
</useglobaltypes>
- </tdevfilecreate>
+ </kdevfilecreate>
</tdevelop>
diff --git a/languages/java/app_templates/tdeappjava/CMakeLists.txt b/languages/java/app_templates/tdeappjava/CMakeLists.txt
deleted file mode 100644
index 578b6e9d..00000000
--- a/languages/java/app_templates/tdeappjava/CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-#################################################
-#
-# (C) 2010-2011 Serghei Amelian
-# serghei (DOT) amelian (AT) gmail.com
-#
-# Improvements and feedback are welcome
-#
-# This file is released under GPL >= 2
-#
-#################################################
-
-add_custom_target( tdeappjava.tar.gz ALL
- COMMAND tar zcf tdeappjava.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
- app.java pref.java appview.java app_client.java appui.rc
- src-Makefile.am tdeappjava.png app.tdevelop subdirs
-)
-
-
-install( FILES
- ${CMAKE_CURRENT_BINARY_DIR}/tdeappjava.tar.gz tdeappjava.png
- DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
-
-
-install( FILES
- tdeappjava.tdevtemplate
- DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/java/backgroundparser.cpp b/languages/java/backgroundparser.cpp
index 006b0127..d6a034e4 100644
--- a/languages/java/backgroundparser.cpp
+++ b/languages/java/backgroundparser.cpp
@@ -13,8 +13,8 @@
#include "javasupportpart.h"
#include "javasupport_events.h"
#include "driver.h"
-#include "tdevdeepcopy.h"
-#include "tdevdriver.h"
+#include "kdevdeepcopy.h"
+#include "kdevdriver.h"
#include <tqmutex.h>
@@ -23,8 +23,8 @@
#include <tdetexteditor/document.h>
#include <tdetexteditor/view.h>
-#include <tdevpartcontroller.h>
-#include <tdevproject.h>
+#include <kdevpartcontroller.h>
+#include <kdevproject.h>
#include <kurl.h>
#include <kdebug.h>
@@ -178,7 +178,7 @@ BackgroundParser::BackgroundParser( JavaSupportPart* part, TQWaitCondition* cons
: m_consumed( consumed ), m_javaSupport( part ), m_close( false )
{
m_fileList = new SynchronizedFileList();
- m_driver = new TDevDriver( m_javaSupport );
+ m_driver = new KDevDriver( m_javaSupport );
m_driver->setSourceProvider( new KDevSourceProvider(m_javaSupport) );
//disabled for now m_driver->setResolveDependencesEnabled( true );
}
diff --git a/languages/java/backgroundparser.h b/languages/java/backgroundparser.h
index db197e31..fee2bc78 100644
--- a/languages/java/backgroundparser.h
+++ b/languages/java/backgroundparser.h
@@ -71,7 +71,7 @@ protected:
Unit* parseFile( const TQString& fileName, bool readFromDisk );
private:
- class TDevDriver* m_driver;
+ class KDevDriver* m_driver;
TQString m_currentFile;
TQWaitCondition m_canParse;
TQWaitCondition m_isEmpty;
diff --git a/languages/java/doc/CMakeLists.txt b/languages/java/doc/CMakeLists.txt
index 23acf492..685a980d 100644
--- a/languages/java/doc/CMakeLists.txt
+++ b/languages/java/doc/CMakeLists.txt
@@ -11,4 +11,4 @@
install( FILES
sw.toc java_bugs_gcc.toc java_bugs_sun.toc
- DESTINATION ${DATA_INSTALL_DIR}/tdevdocumentation/tocs )
+ DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/tocs )
diff --git a/languages/java/doc/Makefile.am b/languages/java/doc/Makefile.am
index f163d148..adb0f24f 100644
--- a/languages/java/doc/Makefile.am
+++ b/languages/java/doc/Makefile.am
@@ -1,4 +1,4 @@
-tocdir = ${kde_datadir}/tdevdocumentation/tocs
+tocdir = ${kde_datadir}/kdevdocumentation/tocs
toc_DATA = sw.toc java_bugs_gcc.toc java_bugs_sun.toc
#indexdir = ${kde_datadir}/devdoctreeview/indices
diff --git a/languages/java/file_templates/CMakeLists.txt b/languages/java/file_templates/CMakeLists.txt
index cee049fb..848555dd 100644
--- a/languages/java/file_templates/CMakeLists.txt
+++ b/languages/java/file_templates/CMakeLists.txt
@@ -11,4 +11,4 @@
install( FILES
java
- DESTINATION ${DATA_INSTALL_DIR}/tdevfilecreate/file-templates )
+ DESTINATION ${DATA_INSTALL_DIR}/kdevfilecreate/file-templates )
diff --git a/languages/java/file_templates/Makefile.am b/languages/java/file_templates/Makefile.am
index 4d9013d4..dc3b82a9 100644
--- a/languages/java/file_templates/Makefile.am
+++ b/languages/java/file_templates/Makefile.am
@@ -1,4 +1,4 @@
-templatedir = $(kde_datadir)/tdevfilecreate/file-templates
+templatedir = $(kde_datadir)/kdevfilecreate/file-templates
template_DATA = java
diff --git a/languages/java/javasupport_events.h b/languages/java/javasupport_events.h
index b2022af2..36cda51b 100644
--- a/languages/java/javasupport_events.h
+++ b/languages/java/javasupport_events.h
@@ -13,7 +13,7 @@
#define __javasupport_events_h
#include "driver.h"
-#include "tdevdeepcopy.h"
+#include "kdevdeepcopy.h"
#include <tqevent.h>
#include <tqvaluelist.h>
diff --git a/languages/java/javasupportfactory.cpp b/languages/java/javasupportfactory.cpp
index ac1eaadb..94e435f2 100644
--- a/languages/java/javasupportfactory.cpp
+++ b/languages/java/javasupportfactory.cpp
@@ -11,28 +11,28 @@
#include <kinstance.h>
#include <kstandarddirs.h>
-#include <tdevplugininfo.h>
+#include <kdevplugininfo.h>
#include "javasupportfactory.h"
-static const TDevPluginInfo data("tdevjavasupport");
-K_EXPORT_COMPONENT_FACTORY( libtdevjavasupport, JavaSupportFactory )
+static const KDevPluginInfo data("kdevjavasupport");
+K_EXPORT_COMPONENT_FACTORY( libkdevjavasupport, JavaSupportFactory )
JavaSupportFactory::JavaSupportFactory()
- : TDevGenericFactory<JavaSupportPart>( data )
+ : KDevGenericFactory<JavaSupportPart>( data )
{
}
TDEInstance *JavaSupportFactory::createInstance()
{
- TDEInstance *instance = TDevGenericFactory<JavaSupportPart>::createInstance();
+ TDEInstance *instance = KDevGenericFactory<JavaSupportPart>::createInstance();
TDEStandardDirs *dirs = instance->dirs();
- dirs->addResourceType( "newclasstemplates", TDEStandardDirs::kde_default("data") + "tdevjavasupport/newclass/" );
- dirs->addResourceType( "pcs", TDEStandardDirs::kde_default( "data" ) + "tdevjavasupport/pcs/" );
+ dirs->addResourceType( "newclasstemplates", TDEStandardDirs::kde_default("data") + "kdevjavasupport/newclass/" );
+ dirs->addResourceType( "pcs", TDEStandardDirs::kde_default( "data" ) + "kdevjavasupport/pcs/" );
return instance;
}
-const TDevPluginInfo *JavaSupportFactory::info()
+const KDevPluginInfo *JavaSupportFactory::info()
{
return &data;
}
diff --git a/languages/java/javasupportfactory.h b/languages/java/javasupportfactory.h
index cb231d34..e5ae52b4 100644
--- a/languages/java/javasupportfactory.h
+++ b/languages/java/javasupportfactory.h
@@ -12,17 +12,17 @@
#ifndef _JAVASUPPORTFACTORY_H_
#define _JAVASUPPORTFACTORY_H_
-#include <tdevgenericfactory.h>
+#include <kdevgenericfactory.h>
#include "javasupportpart.h"
-class TDevPluginInfo;
+class KDevPluginInfo;
-class JavaSupportFactory : public TDevGenericFactory<JavaSupportPart>
+class JavaSupportFactory : public KDevGenericFactory<JavaSupportPart>
{
public:
JavaSupportFactory();
- static const TDevPluginInfo *info();
+ static const KDevPluginInfo *info();
protected:
virtual TDEInstance *createInstance();
diff --git a/languages/java/javasupportpart.cpp b/languages/java/javasupportpart.cpp
index 3c2090e8..63b174fc 100644
--- a/languages/java/javasupportpart.cpp
+++ b/languages/java/javasupportpart.cpp
@@ -17,10 +17,10 @@
#include "javasupport_events.h"
#include "problemreporter.h"
#include "backgroundparser.h"
-#include "TDevJavaSupportIface.h"
+#include "KDevJavaSupportIface.h"
#include "javasupportfactory.h"
#include "catalog.h"
-#include "tdevdriver.h"
+#include "kdevdriver.h"
#include "javasupport_utils.h"
#include "JavaStoreWalker.hpp"
@@ -63,12 +63,12 @@
#include <tdetexteditor/texthintinterface.h>
-#include <tdevcore.h>
-#include <tdevproject.h>
-#include <tdevmainwindow.h>
-#include <tdevpartcontroller.h>
-#include <tdevmakefrontend.h>
-#include <tdevcoderepository.h>
+#include <kdevcore.h>
+#include <kdevproject.h>
+#include <kdevmainwindow.h>
+#include <kdevpartcontroller.h>
+#include <kdevmakefrontend.h>
+#include <kdevcoderepository.h>
#include <domutil.h>
#include <urlutil.h>
@@ -77,11 +77,11 @@
enum { KDEV_DB_VERSION = 7 };
enum { KDEV_PCS_VERSION = 8 };
-class JavaDriver: public TDevDriver
+class JavaDriver: public KDevDriver
{
public:
JavaDriver( JavaSupportPart* javaSupport )
- : TDevDriver( javaSupport )
+ : KDevDriver( javaSupport )
{
}
@@ -119,7 +119,7 @@ public:
};
JavaSupportPart::JavaSupportPart(TQObject *parent, const char *name, const TQStringList &/*args*/)
- : TDevLanguageSupport(JavaSupportFactory::info(), parent, name ? name : "TDevJavaSupport"),
+ : KDevLanguageSupport(JavaSupportFactory::info(), parent, name ? name : "KDevJavaSupport"),
m_activeDocument( 0 ), m_activeView( 0 ), m_activeSelection( 0 ), m_activeEditor( 0 ),
m_activeViewCursor( 0 ), m_projectClosed( true ), m_valid( false )
{
@@ -127,7 +127,7 @@ JavaSupportPart::JavaSupportPart(TQObject *parent, const char *name, const TQStr
m_driver = new JavaDriver( this );
- setXMLFile( "tdevjavasupport.rc" );
+ setXMLFile( "kdevjavasupport.rc" );
m_catalogList.setAutoDelete( true );
setupCatalog();
@@ -167,7 +167,7 @@ JavaSupportPart::JavaSupportPart(TQObject *parent, const char *name, const TQStr
connect( core( ), TQT_SIGNAL( projectConfigWidget( KDialogBase* ) ), this,
TQT_SLOT( projectConfigWidget( KDialogBase* ) ) );
- new TDevJavaSupportIface( this );
+ new KDevJavaSupportIface( this );
//(void) dcopClient();
}
@@ -434,7 +434,7 @@ TQString JavaSupportPart::findSourceFile()
return m_activeFileName;
}
-TDevLanguageSupport::Features JavaSupportPart::features()
+KDevLanguageSupport::Features JavaSupportPart::features()
{
return Features( Classes | Functions | Variables );
}
@@ -830,7 +830,7 @@ TQString JavaSupportPart::formatModelItem( const CodeModelItem *item, bool short
return arg.stripWhiteSpace();
}
else
- return TDevLanguageSupport::formatModelItem( item, shortDescription );
+ return KDevLanguageSupport::formatModelItem( item, shortDescription );
}
void JavaSupportPart::addClass( )
diff --git a/languages/java/javasupportpart.h b/languages/java/javasupportpart.h
index 6154cb8f..a69e3524 100644
--- a/languages/java/javasupportpart.h
+++ b/languages/java/javasupportpart.h
@@ -16,8 +16,8 @@
#ifndef _JAVASUPPORTPART_H_
#define _JAVASUPPORTPART_H_
-#include <tdevcore.h>
-#include <tdevlanguagesupport.h>
+#include <kdevcore.h>
+#include <kdevlanguagesupport.h>
#include <kdialogbase.h>
#include <tqguardedptr.h>
@@ -46,7 +46,7 @@ namespace KTextEditor
class ViewCursorInterface;
}
-class JavaSupportPart : public TDevLanguageSupport
+class JavaSupportPart : public KDevLanguageSupport
{
Q_OBJECT
@@ -82,7 +82,7 @@ signals:
void fileParsed( const TQString& fileName );
protected:
- virtual TDevLanguageSupport::Features features();
+ virtual KDevLanguageSupport::Features features();
virtual KMimeType::List mimeTypes();
virtual TQString formatClassName(const TQString &name);
virtual TQString unformatClassName(const TQString &name);
@@ -159,7 +159,7 @@ private:
FunctionDom m_activeFunction;
VariableDom m_activeVariable;
- friend class TDevJavaSupportIface;
+ friend class KDevJavaSupportIface;
friend class JavaDriver;
};
diff --git a/languages/java/tdevdeepcopy.h b/languages/java/kdevdeepcopy.h
index c4f889c1..dd4d8f4d 100644
--- a/languages/java/tdevdeepcopy.h
+++ b/languages/java/kdevdeepcopy.h
@@ -1,5 +1,5 @@
-#ifndef TDEVDEEPCOPY_H
-#define TDEVDEEPCOPY_H
+#ifndef KDEVDEEPCOPY_H
+#define KDEVDEEPCOPY_H
#include <tqstring.h>
diff --git a/languages/java/tdevdriver.cpp b/languages/java/kdevdriver.cpp
index d36a23f3..d19a20c3 100644
--- a/languages/java/tdevdriver.cpp
+++ b/languages/java/kdevdriver.cpp
@@ -1,20 +1,20 @@
-#include "tdevdriver.h"
+#include "kdevdriver.h"
#include "JavaLexer.hpp"
#include <unistd.h>
#include <tqfileinfo.h>
-TDevDriver::TDevDriver( JavaSupportPart* javaSupport )
+KDevDriver::KDevDriver( JavaSupportPart* javaSupport )
: m_javaSupport( javaSupport )
{
}
-JavaSupportPart* TDevDriver::javaSupport()
+JavaSupportPart* KDevDriver::javaSupport()
{
return m_javaSupport;
}
-void TDevDriver::setupProject()
+void KDevDriver::setupProject()
{
TQMap<TQString, bool> map;
@@ -38,7 +38,7 @@ void TDevDriver::setupProject()
}
}
-void TDevDriver::setupLexer( JavaLexer* lexer )
+void KDevDriver::setupLexer( JavaLexer* lexer )
{
Driver::setupLexer( lexer );
}
diff --git a/languages/java/tdevdriver.h b/languages/java/kdevdriver.h
index 27fd7854..cc0a1393 100644
--- a/languages/java/tdevdriver.h
+++ b/languages/java/kdevdriver.h
@@ -1,10 +1,10 @@
-#ifndef __tdevdriver_h
-#define __tdevdriver_h
+#ifndef __kdevdriver_h
+#define __kdevdriver_h
#include "javasupportpart.h"
-#include <tdevproject.h>
+#include <kdevproject.h>
#include <tdeversion.h>
#include "driver.h"
@@ -12,10 +12,10 @@
#include <cstdlib>
#include <unistd.h>
-class TDevDriver: public Driver
+class KDevDriver: public Driver
{
public:
- TDevDriver( JavaSupportPart* javaSupport );
+ KDevDriver( JavaSupportPart* javaSupport );
JavaSupportPart* javaSupport();
void setupProject();
diff --git a/languages/java/tdevjavasupport.desktop b/languages/java/kdevjavasupport.desktop
index 6d3553d7..620fb10f 100644
--- a/languages/java/tdevjavasupport.desktop
+++ b/languages/java/kdevjavasupport.desktop
@@ -35,7 +35,7 @@ Comment[tg]=Ёрӣ намудани забони Java
Comment[tr]=Java Desteği
Comment[zh_CN]=Java 支持
Comment[zh_TW]=Java 支援
-Name=TDevJavaSupport
+Name=KDevJavaSupport
Name[da]=TDevelop Java-understøttelse
Name[de]=Unterstützung für Java (TDevelop)
Name[hi]=के-डेव-जावा-समर्थन
@@ -79,7 +79,7 @@ GenericName[tr]=Java Desteği
GenericName[zh_CN]=Java 支持
GenericName[zh_TW]=Java 支援
ServiceTypes=TDevelop/LanguageSupport
-X-TDE-Library=libtdevjavasupport
+X-TDE-Library=libkdevjavasupport
X-TDevelop-Version=5
X-TDevelop-Language=Java
X-TDevelop-Args=Java
diff --git a/languages/java/tdevjavasupport.rc b/languages/java/kdevjavasupport.rc
index 66c7975c..e9b80d0d 100644
--- a/languages/java/tdevjavasupport.rc
+++ b/languages/java/kdevjavasupport.rc
@@ -1,4 +1,4 @@
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="TDevJavaSupport" version="4">
+<kpartgui name="KDevJavaSupport" version="4">
</kpartgui>
diff --git a/languages/java/newclass_templates/Makefile.am b/languages/java/newclass_templates/Makefile.am
index f8b9e3bd..d24c99ef 100644
--- a/languages/java/newclass_templates/Makefile.am
+++ b/languages/java/newclass_templates/Makefile.am
@@ -1,4 +1,4 @@
-javasupportdatadir = ${kde_datadir}/tdevjavasupport
+javasupportdatadir = ${kde_datadir}/kdevjavasupport
newclassdir = ${javasupportdatadir}/newclass
newclass_DATA = java_source
diff --git a/languages/java/problemreporter.cpp b/languages/java/problemreporter.cpp
index 6b6a46e6..4d4f47af 100644
--- a/languages/java/problemreporter.cpp
+++ b/languages/java/problemreporter.cpp
@@ -21,8 +21,8 @@
#include "configproblemreporter.h"
#include "backgroundparser.h"
-#include <tdevpartcontroller.h>
-#include <tdevmainwindow.h>
+#include <kdevpartcontroller.h>
+#include <kdevmainwindow.h>
#include <tdeversion.h>
#include <tdeparts/part.h>