Revert "Finish renaming tdevelop components"

This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73.

38 files changed, 116 insertions, 116 deletions

diff --git a/languages/pascal/CMakeLists.txt b/languages/pascal/CMakeLists.txt
index cd398415..7449570e 100644
--- a/languages/pascal/CMakeLists.txt
+++ b/languages/pascal/CMakeLists.txt
@@ -34,18 +34,18 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevpascalsupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES tdevpascalsupport.rc DESTINATION ${DATA_INSTALL_DIR}/tdevpascalsupport )
-install( FILES pascaltemplates DESTINATION ${DATA_INSTALL_DIR}/tdevabbrev/templates )
+install( FILES kdevpascalsupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevpascalsupport.rc DESTINATION ${DATA_INSTALL_DIR}/kdevpascalsupport )
+install( FILES pascaltemplates DESTINATION ${DATA_INSTALL_DIR}/kdevabbrev/templates )
 
 
-##### libtdevpascalsupport (module) #############
+##### libkdevpascalsupport (module) #############
 
-tde_add_kpart( libtdevpascalsupport AUTOMOC
+tde_add_kpart( libkdevpascalsupport AUTOMOC
   SOURCES
     pascalsupport_part.cpp PascalLexer.cpp PascalParser.cpp
     PascalStoreWalker.cpp backgroundparser.cpp
     configproblemreporter.ui problemreporter.cpp
-  LINK antlr-static tdevcatalog-shared tdevelop-shared
+  LINK antlr-static kdevcatalog-shared tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/languages/pascal/Makefile.am b/languages/pascal/Makefile.am
index 403f37f9..9d168734 100644
--- a/languages/pascal/Makefile.am
+++ b/languages/pascal/Makefile.am
@@ -5,19 +5,19 @@ INCLUDES = -I$(top_srcdir)/lib/antlr -I$(top_srcdir)/lib/catalog \
 	$(all_includes)
 SUBDIRS = file_templates app_templates compiler doc
 
-kde_module_LTLIBRARIES = libtdevpascalsupport.la
-libtdevpascalsupport_la_LDFLAGS = $(LEXLIB) $(all_libraries) $(KDE_PLUGIN)
-libtdevpascalsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/antlr/src/libantlr.la $(top_builddir)/lib/catalog/libtdevcatalog.la
+kde_module_LTLIBRARIES = libkdevpascalsupport.la
+libkdevpascalsupport_la_LDFLAGS = $(LEXLIB) $(all_libraries) $(KDE_PLUGIN)
+libkdevpascalsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/antlr/src/libantlr.la $(top_builddir)/lib/catalog/libkdevcatalog.la
 
-libtdevpascalsupport_la_SOURCES = pascalsupport_part.cpp PascalLexer.cpp PascalParser.cpp PascalStoreWalker.cpp backgroundparser.cpp configproblemreporter.ui problemreporter.cpp
+libkdevpascalsupport_la_SOURCES = pascalsupport_part.cpp PascalLexer.cpp PascalParser.cpp PascalStoreWalker.cpp backgroundparser.cpp configproblemreporter.ui problemreporter.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevpascalsupport.desktop
+service_DATA = kdevpascalsupport.desktop
 
-rcdir = $(kde_datadir)/tdevpascalsupport
-rc_DATA = tdevpascalsupport.rc
+rcdir = $(kde_datadir)/kdevpascalsupport
+rc_DATA = kdevpascalsupport.rc
 
 genparser:
 	antlr   pascal.g && antlr pascal.tree.g
@@ -29,5 +29,5 @@ genparser:
 #PascalStoreWalker.hpp PascalStoreWalker.cpp: pascal.tree.g
 #	antlr pascal.tree.g
 
-templatedir = ${kde_datadir}/tdevabbrev/templates
+templatedir = ${kde_datadir}/kdevabbrev/templates
 template_DATA = pascaltemplates
diff --git a/languages/pascal/app_templates/fpcgtk/CMakeLists.txt b/languages/pascal/app_templates/fpcgtk/CMakeLists.txt
index b4a2e071..eb16e978 100644
--- a/languages/pascal/app_templates/fpcgtk/CMakeLists.txt
+++ b/languages/pascal/app_templates/fpcgtk/CMakeLists.txt
@@ -17,9 +17,9 @@ add_custom_target( fpcgtk.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/fpcgtk.tar.gz fpcgtk.png
-  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
 
 
 install( FILES
-    fpcgtk.tdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
+    fpcgtk.kdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
diff --git a/languages/pascal/app_templates/fpcgtk/Makefile.am b/languages/pascal/app_templates/fpcgtk/Makefile.am
index e9744c9b..5c4c116f 100644
--- a/languages/pascal/app_templates/fpcgtk/Makefile.am
+++ b/languages/pascal/app_templates/fpcgtk/Makefile.am
@@ -2,10 +2,10 @@ dataFiles = main.pp app.tdevelop
 templateName = fpcgtk
 
 ### 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/pascal/app_templates/fpcgtk/app.tdevelop b/languages/pascal/app_templates/fpcgtk/app.tdevelop
index bbd6d777..e7b3a147 100644
--- a/languages/pascal/app_templates/fpcgtk/app.tdevelop
+++ b/languages/pascal/app_templates/fpcgtk/app.tdevelop
@@ -11,7 +11,7 @@
    <keyword>Code</keyword>
   </keywords>
  </general>
- <tdevpascalproject>
+ <kdevpascalproject>
   <general>
     <useconfiguration>default</useconfiguration>
   </general>
@@ -26,8 +26,8 @@
   <run>
    <terminal>false</terminal>
   </run>
- </tdevpascalproject>
- <tdevdoctreeview>
+ </kdevpascalproject>
+ <kdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -75,12 +75,12 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </tdevdoctreeview>
- <tdevfilecreate>
+ </kdevdoctreeview>
+ <kdevfilecreate>
   <useglobaltypes>
    <type ext="pp"/>
    <type ext="pas"/>
    <type ext="dpr"/>
   </useglobaltypes>
- </tdevfilecreate>
+ </kdevfilecreate>
 </tdevelop>
diff --git a/languages/pascal/app_templates/fpcgtk/fpcgtk.tdevtemplate b/languages/pascal/app_templates/fpcgtk/fpcgtk.kdevtemplate
index d0103844..45bb7eea 100644
--- a/languages/pascal/app_templates/fpcgtk/fpcgtk.tdevtemplate
+++ b/languages/pascal/app_templates/fpcgtk/fpcgtk.kdevtemplate
@@ -64,7 +64,7 @@ Archive=fpcgtk.tar.gz
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.tdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [FILE1]
 Type=install
diff --git a/languages/pascal/app_templates/fpchello/CMakeLists.txt b/languages/pascal/app_templates/fpchello/CMakeLists.txt
index 37ac3aa9..12941440 100644
--- a/languages/pascal/app_templates/fpchello/CMakeLists.txt
+++ b/languages/pascal/app_templates/fpchello/CMakeLists.txt
@@ -17,9 +17,9 @@ add_custom_target( fpchello.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/fpchello.tar.gz fpchello.png
-  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
 
 
 install( FILES
-    fpchello.tdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
+    fpchello.kdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
diff --git a/languages/pascal/app_templates/fpchello/Makefile.am b/languages/pascal/app_templates/fpchello/Makefile.am
index f5567a09..744bc214 100644
--- a/languages/pascal/app_templates/fpchello/Makefile.am
+++ b/languages/pascal/app_templates/fpchello/Makefile.am
@@ -2,10 +2,10 @@ dataFiles = main.pp app.tdevelop
 templateName = fpchello
 
 ### 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/pascal/app_templates/fpchello/app.tdevelop b/languages/pascal/app_templates/fpchello/app.tdevelop
index 603e6e6b..a2f83092 100644
--- a/languages/pascal/app_templates/fpchello/app.tdevelop
+++ b/languages/pascal/app_templates/fpchello/app.tdevelop
@@ -11,7 +11,7 @@
    <keyword>Code</keyword>
   </keywords>
  </general>
- <tdevpascalproject>
+ <kdevpascalproject>
   <general>
     <useconfiguration>default</useconfiguration>
   </general>
@@ -26,8 +26,8 @@
   <run>
    <terminal>true</terminal>
   </run>
- </tdevpascalproject>
- <tdevdoctreeview>
+ </kdevpascalproject>
+ <kdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -75,12 +75,12 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </tdevdoctreeview>
- <tdevfilecreate>
+ </kdevdoctreeview>
+ <kdevfilecreate>
   <useglobaltypes>
    <type ext="pp"/>
    <type ext="pas"/>
    <type ext="dpr"/>
   </useglobaltypes>
- </tdevfilecreate>
+ </kdevfilecreate>
 </tdevelop>
diff --git a/languages/pascal/app_templates/fpchello/fpchello.tdevtemplate b/languages/pascal/app_templates/fpchello/fpchello.kdevtemplate
index 21c213f4..65c46115 100644
--- a/languages/pascal/app_templates/fpchello/fpchello.tdevtemplate
+++ b/languages/pascal/app_templates/fpchello/fpchello.kdevtemplate
@@ -65,7 +65,7 @@ Archive=fpchello.tar.gz
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.tdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [FILE1]
 Type=install
diff --git a/languages/pascal/app_templates/fpcsharedlib/CMakeLists.txt b/languages/pascal/app_templates/fpcsharedlib/CMakeLists.txt
index 779eda2d..52a5e4f7 100644
--- a/languages/pascal/app_templates/fpcsharedlib/CMakeLists.txt
+++ b/languages/pascal/app_templates/fpcsharedlib/CMakeLists.txt
@@ -17,9 +17,9 @@ add_custom_target( fpcsharedlib.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/fpcsharedlib.tar.gz fpcsharedlib.png
-  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
 
 
 install( FILES
-    fpcsharedlib.tdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
+    fpcsharedlib.kdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
diff --git a/languages/pascal/app_templates/fpcsharedlib/Makefile.am b/languages/pascal/app_templates/fpcsharedlib/Makefile.am
index 13194e81..d1d0eef4 100644
--- a/languages/pascal/app_templates/fpcsharedlib/Makefile.am
+++ b/languages/pascal/app_templates/fpcsharedlib/Makefile.am
@@ -2,10 +2,10 @@ dataFiles = main.pp app.tdevelop
 templateName = fpcsharedlib
 
 ### 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/pascal/app_templates/fpcsharedlib/app.tdevelop b/languages/pascal/app_templates/fpcsharedlib/app.tdevelop
index e0289480..8249e017 100644
--- a/languages/pascal/app_templates/fpcsharedlib/app.tdevelop
+++ b/languages/pascal/app_templates/fpcsharedlib/app.tdevelop
@@ -11,7 +11,7 @@
    <keyword>Code</keyword>

   </keywords>

  </general>

- <tdevpascalproject>

+ <kdevpascalproject>

   <general>

     <useconfiguration>default</useconfiguration>

   </general>

@@ -26,8 +26,8 @@
   <run>

    <terminal>true</terminal>

   </run>

- </tdevpascalproject>

- <tdevdoctreeview>

+ </kdevpascalproject>

+ <kdevdoctreeview>

     <ignoretocs>

       <toc>ada</toc>

       <toc>ada_bugs_gcc</toc>

@@ -75,12 +75,12 @@
     <ignoredoxygen>

       <toc>KDE Libraries (Doxygen)</toc>

     </ignoredoxygen>

- </tdevdoctreeview>

- <tdevfilecreate>

+ </kdevdoctreeview>

+ <kdevfilecreate>

   <useglobaltypes>

    <type ext="pp"/>

    <type ext="pas"/>

    <type ext="dpr"/>

   </useglobaltypes>

- </tdevfilecreate>

+ </kdevfilecreate>

 </tdevelop>

diff --git a/languages/pascal/app_templates/fpcsharedlib/fpcsharedlib.tdevtemplate b/languages/pascal/app_templates/fpcsharedlib/fpcsharedlib.kdevtemplate
index 3c4e93bf..35835599 100644
--- a/languages/pascal/app_templates/fpcsharedlib/fpcsharedlib.tdevtemplate
+++ b/languages/pascal/app_templates/fpcsharedlib/fpcsharedlib.kdevtemplate
@@ -65,7 +65,7 @@ Archive=fpcsharedlib.tar.gz
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.tdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [FILE1]
 Type=install
diff --git a/languages/pascal/app_templates/pascalhello/CMakeLists.txt b/languages/pascal/app_templates/pascalhello/CMakeLists.txt
index a9d1b313..3422a8ff 100644
--- a/languages/pascal/app_templates/pascalhello/CMakeLists.txt
+++ b/languages/pascal/app_templates/pascalhello/CMakeLists.txt
@@ -17,9 +17,9 @@ add_custom_target( pascalhello.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/pascalhello.tar.gz pascalhello.png
-  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
 
 
 install( FILES
-    pascalhello.tdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
+    pascalhello.kdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
diff --git a/languages/pascal/app_templates/pascalhello/Makefile.am b/languages/pascal/app_templates/pascalhello/Makefile.am
index 96ce40c7..3e72435c 100644
--- a/languages/pascal/app_templates/pascalhello/Makefile.am
+++ b/languages/pascal/app_templates/pascalhello/Makefile.am
@@ -2,10 +2,10 @@ dataFiles = main.pp app.tdevelop
 templateName = pascalhello
 
 ### 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/pascal/app_templates/pascalhello/app.tdevelop b/languages/pascal/app_templates/pascalhello/app.tdevelop
index 8e571db2..51e8c65e 100644
--- a/languages/pascal/app_templates/pascalhello/app.tdevelop
+++ b/languages/pascal/app_templates/pascalhello/app.tdevelop
@@ -11,7 +11,7 @@
    <keyword>Code</keyword>
   </keywords>
  </general>
- <tdevpascalproject>
+ <kdevpascalproject>
   <general>
     <useconfiguration>default</useconfiguration>
   </general>
@@ -23,8 +23,8 @@
   <run>
    <terminal>true</terminal>
   </run>
- </tdevpascalproject>
- <tdevdoctreeview>
+ </kdevpascalproject>
+ <kdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -72,12 +72,12 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </tdevdoctreeview>
- <tdevfilecreate>
+ </kdevdoctreeview>
+ <kdevfilecreate>
   <useglobaltypes>
    <type ext="pp"/>
    <type ext="pas"/>
    <type ext="dpr"/>
   </useglobaltypes>
- </tdevfilecreate>
+ </kdevfilecreate>
 </tdevelop>
diff --git a/languages/pascal/app_templates/pascalhello/pascalhello.tdevtemplate b/languages/pascal/app_templates/pascalhello/pascalhello.kdevtemplate
index e70ca533..ed7104cb 100644
--- a/languages/pascal/app_templates/pascalhello/pascalhello.tdevtemplate
+++ b/languages/pascal/app_templates/pascalhello/pascalhello.kdevtemplate
@@ -67,7 +67,7 @@ Archive=pascalhello.tar.gz
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.tdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [FILE1]
 Type=install
diff --git a/languages/pascal/compiler/Makefile.am b/languages/pascal/compiler/Makefile.am
index 400962be..c9f7528b 100644
--- a/languages/pascal/compiler/Makefile.am
+++ b/languages/pascal/compiler/Makefile.am
@@ -1,6 +1,6 @@
 # This is the collection of plugins. In contrast to the parts
 # directory, these are 'transient' in a sense and don't
-# share the complete TDevComponent interface.
+# share the complete KDevComponent interface.
 
 SUBDIRS = dccoptions  fpcoptions
 
diff --git a/languages/pascal/compiler/dccoptions/CMakeLists.txt b/languages/pascal/compiler/dccoptions/CMakeLists.txt
index 3e7fbcdd..ae6c6388 100644
--- a/languages/pascal/compiler/dccoptions/CMakeLists.txt
+++ b/languages/pascal/compiler/dccoptions/CMakeLists.txt
@@ -25,13 +25,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevdccoptions.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevdccoptions.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### libtdevdccoptions (module) ################
+##### libkdevdccoptions (module) ################
 
-tde_add_kpart( libtdevdccoptions AUTOMOC
+tde_add_kpart( libkdevdccoptions AUTOMOC
   SOURCES dccoptionsplugin.cpp optiontabs.cpp
-  LINK tdevwidgets-shared tdevextras-shared
+  LINK kdevwidgets-shared kdevextras-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/languages/pascal/compiler/dccoptions/Makefile.am b/languages/pascal/compiler/dccoptions/Makefile.am
index f913ae45..734e63c5 100644
--- a/languages/pascal/compiler/dccoptions/Makefile.am
+++ b/languages/pascal/compiler/dccoptions/Makefile.am
@@ -3,14 +3,14 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/interfaces/extras \
 	-I$(top_srcdir)/lib/widgets $(all_includes)
 
-kde_module_LTLIBRARIES = libtdevdccoptions.la
-libtdevdccoptions_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
-libtdevdccoptions_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
-	$(top_builddir)/lib/widgets/libtdevwidgets.la $(top_builddir)/lib/interfaces/extras/libtdevextras.la $(LIB_TDEHTML)
+kde_module_LTLIBRARIES = libkdevdccoptions.la
+libkdevdccoptions_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
+libkdevdccoptions_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
+	$(top_builddir)/lib/widgets/libkdevwidgets.la $(top_builddir)/lib/interfaces/extras/libkdevextras.la $(LIB_TDEHTML)
 
-libtdevdccoptions_la_SOURCES = dccoptionsplugin.cpp optiontabs.cpp
+libkdevdccoptions_la_SOURCES = dccoptionsplugin.cpp optiontabs.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevdccoptions.desktop
+service_DATA = kdevdccoptions.desktop
diff --git a/languages/pascal/compiler/dccoptions/dccoptionsplugin.cpp b/languages/pascal/compiler/dccoptions/dccoptionsplugin.cpp
index cffbbdd5..8a8ffc54 100644
--- a/languages/pascal/compiler/dccoptions/dccoptionsplugin.cpp
+++ b/languages/pascal/compiler/dccoptions/dccoptionsplugin.cpp
@@ -19,10 +19,10 @@
 
 #include "optiontabs.h"
 
-K_EXPORT_COMPONENT_FACTORY( libtdevdccoptions, KGenericFactory<DccOptionsPlugin>( "tdevdccoptions" ) )
+K_EXPORT_COMPONENT_FACTORY( libkdevdccoptions, KGenericFactory<DccOptionsPlugin>( "kdevdccoptions" ) )
 
 DccOptionsPlugin::DccOptionsPlugin(TQObject *parent, const char *name, const TQStringList/* &args*/)
-    : TDevCompilerOptions(parent, name)
+    : KDevCompilerOptions(parent, name)
 {
 }
 
diff --git a/languages/pascal/compiler/dccoptions/dccoptionsplugin.h b/languages/pascal/compiler/dccoptions/dccoptionsplugin.h
index b0db639d..d8465520 100644
--- a/languages/pascal/compiler/dccoptions/dccoptionsplugin.h
+++ b/languages/pascal/compiler/dccoptions/dccoptionsplugin.h
@@ -13,9 +13,9 @@
 
 #include <kdialogbase.h>
 
-#include "tdevcompileroptions.h"
+#include "kdevcompileroptions.h"
 
-class DccOptionsPlugin : public TDevCompilerOptions
+class DccOptionsPlugin : public KDevCompilerOptions
 {
     Q_OBJECT
   
diff --git a/languages/pascal/compiler/dccoptions/tdevdccoptions.desktop b/languages/pascal/compiler/dccoptions/kdevdccoptions.desktop
index 3631eeb9..e99e9385 100644
--- a/languages/pascal/compiler/dccoptions/tdevdccoptions.desktop
+++ b/languages/pascal/compiler/dccoptions/kdevdccoptions.desktop
@@ -48,7 +48,7 @@ Name[ta]=Dccவிருப்பங்கள்
 Name[tg]=DccИнтихобҳо
 Name[zh_TW]=Dcc 選項
 ServiceTypes=TDevelop/CompilerOptions
-X-TDE-Library=libtdevdccoptions
+X-TDE-Library=libkdevdccoptions
 X-TDevelop-Version=5
 X-TDevelop-Language=Pascal
 X-TDevelop-Args=dcc
diff --git a/languages/pascal/compiler/fpcoptions/CMakeLists.txt b/languages/pascal/compiler/fpcoptions/CMakeLists.txt
index 7d9a010f..12c9ef89 100644
--- a/languages/pascal/compiler/fpcoptions/CMakeLists.txt
+++ b/languages/pascal/compiler/fpcoptions/CMakeLists.txt
@@ -25,13 +25,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevfpcoptions.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevfpcoptions.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### libtdevfpcoptions (module) ################
+##### libkdevfpcoptions (module) ################
 
-tde_add_kpart( libtdevfpcoptions AUTOMOC
+tde_add_kpart( libkdevfpcoptions AUTOMOC
   SOURCES fpcoptionsplugin.cpp optiontabs.cpp
-  LINK tdevwidgets-shared tdevextras-shared
+  LINK kdevwidgets-shared kdevextras-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/languages/pascal/compiler/fpcoptions/Makefile.am b/languages/pascal/compiler/fpcoptions/Makefile.am
index 3d105f6f..70579448 100644
--- a/languages/pascal/compiler/fpcoptions/Makefile.am
+++ b/languages/pascal/compiler/fpcoptions/Makefile.am
@@ -3,17 +3,17 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/interfaces/extras \
 	-I$(top_srcdir)/lib/widgets $(all_includes)
 
-kde_module_LTLIBRARIES = libtdevfpcoptions.la
-libtdevfpcoptions_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
-libtdevfpcoptions_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
-	$(top_builddir)/lib/widgets/libtdevwidgets.la $(top_builddir)/lib/interfaces/extras/libtdevextras.la $(LIB_TDEHTML)
+kde_module_LTLIBRARIES = libkdevfpcoptions.la
+libkdevfpcoptions_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
+libkdevfpcoptions_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
+	$(top_builddir)/lib/widgets/libkdevwidgets.la $(top_builddir)/lib/interfaces/extras/libkdevextras.la $(LIB_TDEHTML)
 
-libtdevfpcoptions_la_SOURCES = fpcoptionsplugin.cpp optiontabs.cpp
+libkdevfpcoptions_la_SOURCES = fpcoptionsplugin.cpp optiontabs.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevfpcoptions.desktop
+service_DATA = kdevfpcoptions.desktop
 
 
 
diff --git a/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp b/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp
index 31babced..0b01fb01 100644
--- a/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp
+++ b/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp
@@ -16,10 +16,10 @@
 #include "optiontabs.h"
 #include "fpcoptionsplugin.h"
 
-K_EXPORT_COMPONENT_FACTORY( libtdevfpcoptions, KGenericFactory<FpcOptionsPlugin>( "tdevfpcoptions" ) )
+K_EXPORT_COMPONENT_FACTORY( libkdevfpcoptions, KGenericFactory<FpcOptionsPlugin>( "kdevfpcoptions" ) )
 
 FpcOptionsPlugin::FpcOptionsPlugin(TQObject *parent, const char *name, const TQStringList& /*args*/)
-    : TDevCompilerOptions(parent, name)
+    : KDevCompilerOptions(parent, name)
 {
 }
 
diff --git a/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.h b/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.h
index cee18e79..e30b33c0 100644
--- a/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.h
+++ b/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.h
@@ -13,9 +13,9 @@
 
 #include <kdialogbase.h>
 
-#include "tdevcompileroptions.h"
+#include "kdevcompileroptions.h"
 
-class FpcOptionsPlugin : public TDevCompilerOptions
+class FpcOptionsPlugin : public KDevCompilerOptions
 {
     Q_OBJECT
   
diff --git a/languages/pascal/compiler/fpcoptions/tdevfpcoptions.desktop b/languages/pascal/compiler/fpcoptions/kdevfpcoptions.desktop
index da25b683..660e973d 100644
--- a/languages/pascal/compiler/fpcoptions/tdevfpcoptions.desktop
+++ b/languages/pascal/compiler/fpcoptions/kdevfpcoptions.desktop
@@ -47,7 +47,7 @@ Name[ta]=Fpcவிருப்பங்கள்
 Name[tg]=FpcИнтихобҳо
 Name[zh_TW]=Fpc 選項
 ServiceTypes=TDevelop/CompilerOptions
-X-TDE-Library=libtdevfpcoptions
+X-TDE-Library=libkdevfpcoptions
 X-TDevelop-Version=5
 X-TDevelop-Language=Pascal
 X-TDevelop-Args=fpc
diff --git a/languages/pascal/doc/CMakeLists.txt b/languages/pascal/doc/CMakeLists.txt
index 37627f81..ade55abb 100644
--- a/languages/pascal/doc/CMakeLists.txt
+++ b/languages/pascal/doc/CMakeLists.txt
@@ -11,4 +11,4 @@
 
 install( FILES
     pascal_bugs_fp.toc
-  DESTINATION ${DATA_INSTALL_DIR}/tdevdocumentation/tocs )
+  DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/tocs )
diff --git a/languages/pascal/doc/Makefile.am b/languages/pascal/doc/Makefile.am
index bf36ead8..a7829d08 100644
--- a/languages/pascal/doc/Makefile.am
+++ b/languages/pascal/doc/Makefile.am
@@ -1,4 +1,4 @@
-tocdir = ${kde_datadir}/tdevdocumentation/tocs
+tocdir = ${kde_datadir}/kdevdocumentation/tocs
 toc_DATA = pascal_bugs_fp.toc
 
 #indexdir = ${kde_datadir}/devdoctreeview/indices
diff --git a/languages/pascal/file_templates/CMakeLists.txt b/languages/pascal/file_templates/CMakeLists.txt
index 5a55baad..812d0398 100644
--- a/languages/pascal/file_templates/CMakeLists.txt
+++ b/languages/pascal/file_templates/CMakeLists.txt
@@ -11,4 +11,4 @@
 
 install( FILES
     dpr pas-program pas-unit pp-program pp-unit
-  DESTINATION ${DATA_INSTALL_DIR}/tdevfilecreate/file-templates )
+  DESTINATION ${DATA_INSTALL_DIR}/kdevfilecreate/file-templates )
diff --git a/languages/pascal/file_templates/Makefile.am b/languages/pascal/file_templates/Makefile.am
index fe16bfb0..94891c97 100644
--- a/languages/pascal/file_templates/Makefile.am
+++ b/languages/pascal/file_templates/Makefile.am
@@ -1,2 +1,2 @@
-templatedir = $(kde_datadir)/tdevfilecreate/file-templates
+templatedir = $(kde_datadir)/kdevfilecreate/file-templates
 template_DATA = dpr pas-program pas-unit pp-program pp-unit
diff --git a/languages/pascal/tdevpascalsupport.desktop b/languages/pascal/kdevpascalsupport.desktop
index 85c50c20..65e9f851 100644
--- a/languages/pascal/tdevpascalsupport.desktop
+++ b/languages/pascal/kdevpascalsupport.desktop
@@ -79,6 +79,6 @@ GenericName[tr]=Pascal Dil Desteği
 GenericName[zh_CN]=Pascal 语言支持
 GenericName[zh_TW]=Pascal 語言支援
 ServiceTypes=TDevelop/LanguageSupport
-X-TDE-Library=libtdevpascalsupport
+X-TDE-Library=libkdevpascalsupport
 X-TDevelop-Version=5
 X-TDevelop-Language=Pascal
diff --git a/languages/pascal/tdevpascalsupport.rc b/languages/pascal/kdevpascalsupport.rc
index 4335b2a6..4335b2a6 100644
--- a/languages/pascal/tdevpascalsupport.rc
+++ b/languages/pascal/kdevpascalsupport.rc
diff --git a/languages/pascal/pascalsupport_part.cpp b/languages/pascal/pascalsupport_part.cpp
index 3b9d8263..69cbebf8 100644
--- a/languages/pascal/pascalsupport_part.cpp
+++ b/languages/pascal/pascalsupport_part.cpp
@@ -15,7 +15,7 @@
 
 #include <kiconloader.h>
 #include <tdelocale.h>
-#include <tdevgenericfactory.h>
+#include <kdevgenericfactory.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
 #include <kstatusbar.h>
@@ -23,11 +23,11 @@
 #include <antlr/ASTFactory.hpp>
 
 #include "catalog.h"
-#include <tdevcore.h>
-#include <tdevmainwindow.h>
-#include <tdevpartcontroller.h>
-#include <tdevproject.h>
-#include <tdevplugininfo.h>
+#include <kdevcore.h>
+#include <kdevmainwindow.h>
+#include <kdevpartcontroller.h>
+#include <kdevproject.h>
+#include <kdevplugininfo.h>
 
 #include "pascalsupport_part.h"
 #include "problemreporter.h"
@@ -43,16 +43,16 @@ struct PascalSupportPartData{
         {}
 };
 
-typedef TDevGenericFactory<PascalSupportPart> PascalSupportFactory;
-static const TDevPluginInfo data("tdevpascalsupport");
-K_EXPORT_COMPONENT_FACTORY( libtdevpascalsupport, PascalSupportFactory( data ) )
+typedef KDevGenericFactory<PascalSupportPart> PascalSupportFactory;
+static const KDevPluginInfo data("kdevpascalsupport");
+K_EXPORT_COMPONENT_FACTORY( libkdevpascalsupport, PascalSupportFactory( data ) )
 
 PascalSupportPart::PascalSupportPart(TQObject *parent, const char *name, const TQStringList &)
-  : TDevLanguageSupport(&data, parent, name ? name : "KDevPascalSupport" ),
+  : KDevLanguageSupport(&data, parent, name ? name : "KDevPascalSupport" ),
     d( new PascalSupportPartData() )
 {
     setInstance(PascalSupportFactory::instance());
-    setXMLFile("tdevpascalsupport.rc");
+    setXMLFile("kdevpascalsupport.rc");
 
     d->problemReporter = new ProblemReporter( this );
     connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)),
@@ -317,7 +317,7 @@ TQString PascalSupportPart::formatModelItem( const CodeModelItem * item, bool sh
         return arg.stripWhiteSpace();
     }
     else
-        return TDevLanguageSupport::formatModelItem( item, shortDescription );
+        return KDevLanguageSupport::formatModelItem( item, shortDescription );
 }
 
 #include "pascalsupport_part.moc"
diff --git a/languages/pascal/pascalsupport_part.h b/languages/pascal/pascalsupport_part.h
index bac5c25b..5c99c2ae 100644
--- a/languages/pascal/pascalsupport_part.h
+++ b/languages/pascal/pascalsupport_part.h
@@ -7,11 +7,11 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  ***************************************************************************/
-#ifndef __TDEVPART_PASCALSUPPORT_H__
-#define __TDEVPART_PASCALSUPPORT_H__
+#ifndef __KDEVPART_PASCALSUPPORT_H__
+#define __KDEVPART_PASCALSUPPORT_H__
 
 #include <tqguardedptr.h>
-#include "tdevlanguagesupport.h"
+#include "kdevlanguagesupport.h"
 
 class PascalSupportWidget;
 class KDialogBase;
@@ -19,7 +19,7 @@ class TQPopupMenu;
 class Context;
 class PascalSupportPartData;
 
-class PascalSupportPart : public TDevLanguageSupport
+class PascalSupportPart : public KDevLanguageSupport
 {
     Q_OBJECT
   
diff --git a/languages/pascal/problemreporter.cpp b/languages/pascal/problemreporter.cpp
index 0d33aec1..2b477063 100644
--- a/languages/pascal/problemreporter.cpp
+++ b/languages/pascal/problemreporter.cpp
@@ -18,8 +18,8 @@
 
 #include "problemreporter.h"
 #include "pascalsupport_part.h"
-#include "tdevpartcontroller.h"
-#include "tdevmainwindow.h"
+#include "kdevpartcontroller.h"
+#include "kdevmainwindow.h"
 #include "configproblemreporter.h"
 #include "backgroundparser.h"