Revert "Finish renaming tdevelop components"

This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73.

15 files changed, 152 insertions, 152 deletions

diff --git a/languages/cpp/debugger/CMakeLists.txt b/languages/cpp/debugger/CMakeLists.txt
index d5b91df2..4b660c1d 100644
--- a/languages/cpp/debugger/CMakeLists.txt
+++ b/languages/cpp/debugger/CMakeLists.txt
@@ -33,13 +33,13 @@ link_directories(
 ##### other data ################################
 
 tde_install_icons( )
-install( FILES tdevdebugger.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES tdevdebugger.rc DESTINATION ${DATA_INSTALL_DIR}/tdevdebugger )
+install( FILES kdevdebugger.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevdebugger.rc DESTINATION ${DATA_INSTALL_DIR}/kdevdebugger )
 
 
-##### libtdevdebugger (module) ##################
+##### libkdevdebugger (module) ##################
 
-tde_add_kpart( libtdevdebugger AUTOMOC
+tde_add_kpart( libkdevdebugger AUTOMOC
   SOURCES
     debuggerdcopinterface.skel debuggerpart.cpp
     dbgcontroller.cpp gdbcontroller.cpp gdbcommand.cpp
@@ -50,6 +50,6 @@ tde_add_kpart( libtdevdebugger AUTOMOC
     debuggerconfigwidgetbase.ui debuggertracingdialogbase.ui
     gdboutputwidget.cpp gdbtable.cpp debuggertracingdialog.cpp
     label_with_double_click.cpp
-  LINK gdbmi_parser-shared lang_debugger-shared tdevwidgets-shared tdevelop-shared
+  LINK gdbmi_parser-shared lang_debugger-shared kdevwidgets-shared tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/languages/cpp/debugger/Makefile.am b/languages/cpp/debugger/Makefile.am
index 40aba33a..09c147ad 100644
--- a/languages/cpp/debugger/Makefile.am
+++ b/languages/cpp/debugger/Makefile.am
@@ -7,13 +7,13 @@ INCLUDES = -I$(top_srcdir)/languages/lib/debugger \
 	-I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util \
 	-I$(top_srcdir)/lib/widgets $(all_includes)
 
-kde_module_LTLIBRARIES = libtdevdebugger.la
-libtdevdebugger_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevdebugger_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/widgets/libtdevwidgets.la $(LIB_TDEHTML) \
+kde_module_LTLIBRARIES = libkdevdebugger.la
+libkdevdebugger_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevdebugger_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_TDEHTML) \
 	$(top_builddir)/languages/lib/debugger/liblang_debugger.la \
 	$(top_builddir)/languages/cpp/debugger/mi/libgdbmi_parser.la
 
-libtdevdebugger_la_SOURCES = debuggerdcopinterface.skel debuggerpart.cpp \
+libkdevdebugger_la_SOURCES = debuggerdcopinterface.skel debuggerpart.cpp \
     dbgcontroller.cpp gdbcontroller.cpp gdbcommand.cpp \
     gdbparser.cpp stty.cpp breakpoint.cpp variablewidget.cpp \
     gdbbreakpointwidget.cpp framestackwidget.cpp disassemblewidget.cpp \
@@ -26,8 +26,8 @@ METASOURCES = AUTO
 KDE_ICON = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevdebugger.desktop
+service_DATA = kdevdebugger.desktop
 
-rcdir = $(kde_datadir)/tdevdebugger
-rc_DATA = tdevdebugger.rc
+rcdir = $(kde_datadir)/kdevdebugger
+rc_DATA = kdevdebugger.rc
 noinst_HEADERS =  gdbtable.h
diff --git a/languages/cpp/debugger/debuggerconfigwidget.cpp b/languages/cpp/debugger/debuggerconfigwidget.cpp
index dab4486b..2b8523ae 100644
--- a/languages/cpp/debugger/debuggerconfigwidget.cpp
+++ b/languages/cpp/debugger/debuggerconfigwidget.cpp
@@ -14,7 +14,7 @@
 #include "debuggerconfigwidget.h"
 
 #include "debuggerpart.h"
-#include "tdevproject.h"
+#include "kdevproject.h"
 
 #include "domutil.h"
 #include <kurlrequester.h>
diff --git a/languages/cpp/debugger/debuggerpart.cpp b/languages/cpp/debugger/debuggerpart.cpp
index f2379ccb..3cae3762 100644
--- a/languages/cpp/debugger/debuggerpart.cpp
+++ b/languages/cpp/debugger/debuggerpart.cpp
@@ -23,7 +23,7 @@
 #include <tdeaction.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
-#include <tdevgenericfactory.h>
+#include <kdevgenericfactory.h>
 #include <kiconloader.h>
 #include <tdelocale.h>
 #include <tdemainwindow.h>
@@ -37,12 +37,12 @@
 #include <kstringhandler.h>
 #include <kdockwidget.h>
 
-#include "tdevcore.h"
-#include "tdevproject.h"
-#include "tdevmainwindow.h"
-#include "tdevappfrontend.h"
-#include "tdevpartcontroller.h"
-#include "tdevdebugger.h"
+#include "kdevcore.h"
+#include "kdevproject.h"
+#include "kdevmainwindow.h"
+#include "kdevappfrontend.h"
+#include "kdevpartcontroller.h"
+#include "kdevdebugger.h"
 #include "domutil.h"
 #include "variablewidget.h"
 #include "gdbbreakpointwidget.h"
@@ -61,7 +61,7 @@
 
 #include <iostream>
 
-#include <tdevplugininfo.h>
+#include <kdevplugininfo.h>
 #include <debugger.h>
 
 
@@ -71,13 +71,13 @@
 namespace GDBDebugger
 {
 
-static const TDevPluginInfo data("tdevdebugger");
+static const KDevPluginInfo data("kdevdebugger");
 
-typedef TDevGenericFactory<DebuggerPart> DebuggerFactory;
-K_EXPORT_COMPONENT_FACTORY( libtdevdebugger, DebuggerFactory( data ) )
+typedef KDevGenericFactory<DebuggerPart> DebuggerFactory;
+K_EXPORT_COMPONENT_FACTORY( libkdevdebugger, DebuggerFactory( data ) )
 
 DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringList & ) :
-    TDevPlugin( &data, parent, name ? name : "DebuggerPart" ),
+    KDevPlugin( &data, parent, name ? name : "DebuggerPart" ),
     controller(0), previousDebuggerState_(s_dbgNotStarted),
     justRestarted_(false), needRebuild_(true),
     running_(false)
@@ -85,7 +85,7 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi
     setObjId("DebuggerInterface");
     setInstance(DebuggerFactory::instance());
 
-    setXMLFile("tdevdebugger.rc");
+    setXMLFile("kdevdebugger.rc");
 
     m_debugger = new Debugger( partController() );
 
@@ -333,8 +333,8 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi
     connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)),
              this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) );
 
-    connect( core(), TQT_SIGNAL(stopButtonClicked(TDevPlugin*)),
-             this, TQT_SLOT(slotStop(TDevPlugin*)) );
+    connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)),
+             this, TQT_SLOT(slotStop(KDevPlugin*)) );
     connect( core(), TQT_SIGNAL(projectClosed()),
              this, TQT_SLOT(projectClosed()) );
 
@@ -858,7 +858,7 @@ void DebuggerPart::slotRun()
             if (rebuild)
             {
                 disconnect(TQT_SIGNAL(buildProject()));
-                // The TDevProject has no method to build the project,
+                // The KDevProject has no method to build the project,
                 // so try connecting to a slot has is present to all
                 // existing project managers.
                 // Note: this assumes that 'slotBuild' will save
@@ -984,7 +984,7 @@ bool DebuggerPart::attachProcess(int pid)
 }
 
 
-void DebuggerPart::slotStop(TDevPlugin* which)
+void DebuggerPart::slotStop(KDevPlugin* which)
 {
     if( which != 0 && which != this )
         return;
@@ -1259,12 +1259,12 @@ bool DebuggerPart::haveModifiedFiles()
 
 }
 
-TDevAppFrontend * GDBDebugger::DebuggerPart::appFrontend( )
+KDevAppFrontend * GDBDebugger::DebuggerPart::appFrontend( )
 {
-    return extension<TDevAppFrontend>("TDevelop/AppFrontend");
+    return extension<KDevAppFrontend>("TDevelop/AppFrontend");
 }
 
-TDevDebugger * GDBDebugger::DebuggerPart::debugger()
+KDevDebugger * GDBDebugger::DebuggerPart::debugger()
 {
     return m_debugger;
 }
diff --git a/languages/cpp/debugger/debuggerpart.h b/languages/cpp/debugger/debuggerpart.h
index f1f27d23..50479249 100644
--- a/languages/cpp/debugger/debuggerpart.h
+++ b/languages/cpp/debugger/debuggerpart.h
@@ -15,8 +15,8 @@
 #define _DEBUGGERPART_H_
 
 #include <tqguardedptr.h>
-#include "tdevplugin.h"
-#include "tdevcore.h"
+#include "kdevplugin.h"
+#include "kdevcore.h"
 
 #include "gdbcontroller.h"
 #include "debuggerdcopinterface.h"
@@ -28,8 +28,8 @@ class TQPopupMenu;
 class KDialogBase;
 class ProcessWidget;
 class ProcessLineMaker;
-class TDevAppFrontend;
-class TDevDebugger;
+class KDevAppFrontend;
+class KDevDebugger;
 
 namespace GDBDebugger
 {
@@ -44,7 +44,7 @@ class VariableWidget;
 class GDBOutputWidget;
 class ViewerWidget;
 
-class DebuggerPart : public TDevPlugin, virtual public DebuggerDCOPInterface
+class DebuggerPart : public KDevPlugin, virtual public DebuggerDCOPInterface
 {
     Q_OBJECT
   
@@ -82,7 +82,7 @@ private slots:
     void slotExamineCore();
     void slotAttachProcess();
     void slotStopDebugger();
-    void slotStop(TDevPlugin* which = 0);
+    void slotStop(KDevPlugin* which = 0);
     void slotPause();
     void slotRunToCursor();
     void slotJumpToCursor();
@@ -116,8 +116,8 @@ private slots:
     void slotEvent(GDBController::event_t);
 
 private:
-    TDevAppFrontend *appFrontend();
-    TDevDebugger *debugger();
+    KDevAppFrontend *appFrontend();
+    KDevDebugger *debugger();
     
     bool attachProcess(int pid);
     bool startDebugger();
@@ -139,7 +139,7 @@ private:
     TQString m_contextIdent;
     TQCString m_drkonqi;
     
-    TDevDebugger *m_debugger;
+    KDevDebugger *m_debugger;
     int previousDebuggerState_;
     // Set to true after each debugger restart
     // Currently used to auto-show variables view
diff --git a/languages/cpp/debugger/tdevdebugger.desktop b/languages/cpp/debugger/kdevdebugger.desktop
index 9db31510..beaf17f3 100644
--- a/languages/cpp/debugger/tdevdebugger.desktop
+++ b/languages/cpp/debugger/kdevdebugger.desktop
@@ -34,7 +34,7 @@ Comment[tg]=Ин модул дар GDB интерфейсро ба ихтиёр
 Comment[tr]=Bu eklenti, C, C++ ve daha fazlası için bir kaynak-düzeyinde hata ayıklayıcı olan GDB için bir önucu sağlar. http://sources.redhat.com/gdb/
 Comment[zh_CN]=这个插件是一个 GDB 前端，一个 C、C++ 和其它语言的源代码调试器。http://sources.redhat.com/gdb/
 Comment[zh_TW]=這個外掛程式提供 GDB 的前端介面。GDB 是一個 C/C++ 還有其它語言的除錯器。http://sources.redhat.com/gdb/
-Name=TDevDebugger
+Name=KDevDebugger
 Name[da]=TDevelop Debugger
 Name[de]=Debugger (TDevelop)
 Name[hi]=के-डेव-डिबगर
@@ -80,7 +80,7 @@ GenericName[zh_CN]=调试器前端
 GenericName[zh_TW]=除錯器前端
 Icon=debugger
 ServiceTypes=TDevelop/Plugin
-X-TDE-Library=libtdevdebugger
+X-TDE-Library=libkdevdebugger
 X-TDevelop-Version=5
 X-TDevelop-Scope=Project
 X-TDevelop-Properties=CompiledDevelopment
diff --git a/languages/cpp/debugger/tdevdebugger.rc b/languages/cpp/debugger/kdevdebugger.rc
index 99a10f3c..801cadb8 100644
--- a/languages/cpp/debugger/tdevdebugger.rc
+++ b/languages/cpp/debugger/kdevdebugger.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="TDevDebugger" version="11">
+<kpartgui name="KDevDebugger" version="11">
 <MenuBar>
  <Menu name="debug">
   <text>&amp;Debug</text>
diff --git a/languages/cpp/debugger/tests/breakpoints/breakpoints.tdevelop b/languages/cpp/debugger/tests/breakpoints/breakpoints.tdevelop
index fc68be33..54214a1b 100644
--- a/languages/cpp/debugger/tests/breakpoints/breakpoints.tdevelop
+++ b/languages/cpp/debugger/tests/breakpoints/breakpoints.tdevelop
@@ -4,14 +4,14 @@
     <author>Vladimir Prus</author>
     <email>ghost@ghostwalk</email>
     <version>$VERSION$</version>
-    <projectmanagement>TDevCustomProject</projectmanagement>
+    <projectmanagement>KDevCustomProject</projectmanagement>
     <primarylanguage>C++</primarylanguage>
     <ignoreparts/>
     <projectdirectory>.</projectdirectory>
     <absoluteprojectpath>false</absoluteprojectpath>
     <description/>
   </general>
-  <tdevcustomproject>
+  <kdevcustomproject>
     <run>
       <mainprogram>breakpoints</mainprogram>
       <directoryradio>executable</directoryradio>
@@ -38,8 +38,8 @@
         <default/>
       </environments>
     </make>
-  </tdevcustomproject>
-  <tdevdebugger>
+  </kdevcustomproject>
+  <kdevdebugger>
     <general>
       <dbgshell/>
       <programargs/>
@@ -56,8 +56,8 @@
       <demanglenames>true</demanglenames>
       <outputradix>10</outputradix>
     </display>
-  </tdevdebugger>
-  <tdevdoctreeview>
+  </kdevdebugger>
+  <kdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -102,16 +102,16 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
-  </tdevdoctreeview>
-  <tdevfilecreate>
+  </kdevdoctreeview>
+  <kdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </tdevfilecreate>
-  <tdevcppsupport>
+  </kdevfilecreate>
+  <kdevcppsupport>
     <references/>
     <codecompletion>
       <includeGlobalFunctions>true</includeGlobalFunctions>
@@ -143,8 +143,8 @@
       <synchronize>true</synchronize>
       <orientation>Vertical</orientation>
     </splitheadersource>
-  </tdevcppsupport>
-  <tdevfileview>
+  </kdevcppsupport>
+  <kdevfileview>
     <groups>
       <hidenonprojectfiles>false</hidenonprojectfiles>
       <hidenonlocation>false</hidenonlocation>
@@ -153,7 +153,7 @@
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
       <hidenonprojectfiles>false</hidenonprojectfiles>
     </tree>
-  </tdevfileview>
+  </kdevfileview>
   <cppsupportpart>
     <filetemplates>
       <interfacesuffix>.h</interfacesuffix>
diff --git a/languages/cpp/debugger/tests/dll/dll.tdevelop b/languages/cpp/debugger/tests/dll/dll.tdevelop
index b875ae48..f92f1d08 100644
--- a/languages/cpp/debugger/tests/dll/dll.tdevelop
+++ b/languages/cpp/debugger/tests/dll/dll.tdevelop
@@ -4,14 +4,14 @@
     <author>Vladimir Prus</author>
     <email>ghost@ghostwalk</email>
     <version>$VERSION$</version>
-    <projectmanagement>TDevCustomProject</projectmanagement>
+    <projectmanagement>KDevCustomProject</projectmanagement>
     <primarylanguage>C++</primarylanguage>
     <ignoreparts/>
     <projectdirectory>.</projectdirectory>
     <absoluteprojectpath>false</absoluteprojectpath>
     <description/>
   </general>
-  <tdevcustomproject>
+  <kdevcustomproject>
     <run>
       <mainprogram>main</mainprogram>
       <directoryradio>executable</directoryradio>
@@ -38,8 +38,8 @@
         <default/>
       </environments>
     </make>
-  </tdevcustomproject>
-  <tdevdebugger>
+  </kdevcustomproject>
+  <kdevdebugger>
     <general>
       <dbgshell/>
       <programargs/>
@@ -56,8 +56,8 @@
       <demanglenames>true</demanglenames>
       <outputradix>10</outputradix>
     </display>
-  </tdevdebugger>
-  <tdevdoctreeview>
+  </kdevdebugger>
+  <kdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -102,22 +102,22 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
-  </tdevdoctreeview>
-  <tdevfilecreate>
+  </kdevdoctreeview>
+  <kdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
   <cppsupportpart>
     <filetemplates>
       <interfacesuffix>.h</interfacesuffix>
       <implementationsuffix>.cpp</implementationsuffix>
     </filetemplates>
   </cppsupportpart>
-  <tdevcppsupport>
+  <kdevcppsupport>
     <qt>
       <used>false</used>
       <version>3</version>
@@ -144,8 +144,8 @@
       <inlineSet>true</inlineSet>
     </creategettersetter>
     <references/>
-  </tdevcppsupport>
-  <tdevfileview>
+  </kdevcppsupport>
+  <kdevfileview>
     <groups>
       <hidenonprojectfiles>false</hidenonprojectfiles>
       <hidenonlocation>false</hidenonlocation>
@@ -154,5 +154,5 @@
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
       <hidenonprojectfiles>false</hidenonprojectfiles>
     </tree>
-  </tdevfileview>
+  </kdevfileview>
 </tdevelop>
diff --git a/languages/cpp/debugger/tests/infinite_loop/infinite_loop.tdevelop b/languages/cpp/debugger/tests/infinite_loop/infinite_loop.tdevelop
index 3096faea..267a73d8 100644
--- a/languages/cpp/debugger/tests/infinite_loop/infinite_loop.tdevelop
+++ b/languages/cpp/debugger/tests/infinite_loop/infinite_loop.tdevelop
@@ -4,22 +4,22 @@
     <author>Vladimir Prus</author>
     <email>ghost@zigzag</email>
     <version>$VERSION$</version>
-    <projectmanagement>TDevCustomProject</projectmanagement>
+    <projectmanagement>KDevCustomProject</projectmanagement>
     <primarylanguage>C++</primarylanguage>
     <ignoreparts/>
   </general>
-  <tdevcustomproject>
+  <kdevcustomproject>
     <run>
       <mainprogram>infinite_loop</mainprogram>
       <directoryradio>executable</directoryradio>
     </run>
-  </tdevcustomproject>
-  <tdevdebugger>
+  </kdevcustomproject>
+  <kdevdebugger>
     <general>
       <dbgshell/>
     </general>
-  </tdevdebugger>
-  <tdevdoctreeview>
+  </kdevdebugger>
+  <kdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -64,16 +64,16 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
-  </tdevdoctreeview>
-  <tdevfilecreate>
+  </kdevdoctreeview>
+  <kdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </tdevfilecreate>
-  <tdevcppsupport>
+  </kdevfilecreate>
+  <kdevcppsupport>
     <references/>
     <codecompletion>
       <includeGlobalFunctions>true</includeGlobalFunctions>
@@ -95,8 +95,8 @@
       <processPrimaryTypes>true</processPrimaryTypes>
       <processFunctionArguments>false</processFunctionArguments>
     </codecompletion>
-  </tdevcppsupport>
-  <tdevfileview>
+  </kdevcppsupport>
+  <kdevfileview>
     <groups>
       <hidenonprojectfiles>false</hidenonprojectfiles>
       <hidenonlocation>false</hidenonlocation>
@@ -105,5 +105,5 @@
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
       <hidenonprojectfiles>false</hidenonprojectfiles>
     </tree>
-  </tdevfileview>
+  </kdevfileview>
 </tdevelop>
diff --git a/languages/cpp/debugger/tests/print_pointers/print_pointers.tdevelop b/languages/cpp/debugger/tests/print_pointers/print_pointers.tdevelop
index fc7f4d19..a838d09d 100644
--- a/languages/cpp/debugger/tests/print_pointers/print_pointers.tdevelop
+++ b/languages/cpp/debugger/tests/print_pointers/print_pointers.tdevelop
@@ -4,7 +4,7 @@
     <author>Vladimir Prus</author>
     <email>ghost@cs.msu.su</email>
     <version>$VERSION$</version>
-    <projectmanagement>TDevCustomProject</projectmanagement>
+    <projectmanagement>KDevCustomProject</projectmanagement>
     <primarylanguage>C++</primarylanguage>
     <ignoreparts>
       <part>kdevsecurity</part>
@@ -18,7 +18,7 @@
     <description/>
     <projectname>print_pointers</projectname>
   </general>
-  <tdevcustomproject>
+  <kdevcustomproject>
     <run>
       <mainprogram>print_pointers</mainprogram>
       <directoryradio>executable</directoryradio>
@@ -62,8 +62,8 @@
       <filetype>CMakeLists.txt</filetype>
     </filetypes>
     <blacklist/>
-  </tdevcustomproject>
-  <tdevdebugger>
+  </kdevcustomproject>
+  <kdevdebugger>
     <general>
       <dbgshell/>
       <programargs/>
@@ -80,8 +80,8 @@
       <demanglenames>true</demanglenames>
       <outputradix>10</outputradix>
     </display>
-  </tdevdebugger>
-  <tdevdoctreeview>
+  </kdevdebugger>
+  <kdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -126,22 +126,22 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
-  </tdevdoctreeview>
-  <tdevfilecreate>
+  </kdevdoctreeview>
+  <kdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
   <cppsupportpart>
     <filetemplates>
       <interfacesuffix>.h</interfacesuffix>
       <implementationsuffix>.cpp</implementationsuffix>
     </filetemplates>
   </cppsupportpart>
-  <tdevcppsupport>
+  <kdevcppsupport>
     <codecompletion>
       <includeGlobalFunctions>true</includeGlobalFunctions>
       <includeTypes>true</includeTypes>
@@ -185,7 +185,7 @@
       <version>3</version>
       <root>/usr/share/qt3</root>
       <includestyle>3</includestyle>
-      <designerintegration>EmbeddedTDevDesigner</designerintegration>
+      <designerintegration>EmbeddedKDevDesigner</designerintegration>
       <qmake>/usr/bin/qmake-qt3</qmake>
       <designer>/usr/bin/designer</designer>
       <designerpluginpaths/>
@@ -195,8 +195,8 @@
       <synchronize>true</synchronize>
       <orientation>Vertical</orientation>
     </splitheadersource>
-  </tdevcppsupport>
-  <tdevfileview>
+  </kdevcppsupport>
+  <kdevfileview>
     <groups>
       <hidenonprojectfiles>false</hidenonprojectfiles>
       <hidenonlocation>false</hidenonlocation>
@@ -205,8 +205,8 @@
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
       <hidenonprojectfiles>false</hidenonprojectfiles>
     </tree>
-  </tdevfileview>
-  <tdevvisualadvance>
+  </kdevfileview>
+  <kdevvisualadvance>
     <emulator>VisualBoyAdvance</emulator>
     <binary/>
     <addOptions/>
@@ -214,5 +214,5 @@
     <fullscreen>false</fullscreen>
     <graphicFilter>-f0</graphicFilter>
     <scaling>-1</scaling>
-  </tdevvisualadvance>
+  </kdevvisualadvance>
 </tdevelop>
diff --git a/languages/cpp/debugger/tests/segfault/segfault.tdevelop b/languages/cpp/debugger/tests/segfault/segfault.tdevelop
index e48ed4e4..4eccf2e1 100644
--- a/languages/cpp/debugger/tests/segfault/segfault.tdevelop
+++ b/languages/cpp/debugger/tests/segfault/segfault.tdevelop
@@ -4,14 +4,14 @@
     <author>Vladimir Prus</author>
     <email>ghost@zigzag</email>
     <version>$VERSION$</version>
-    <projectmanagement>TDevCustomProject</projectmanagement>
+    <projectmanagement>KDevCustomProject</projectmanagement>
     <primarylanguage>C++</primarylanguage>
     <ignoreparts/>
     <projectdirectory>.</projectdirectory>
     <absoluteprojectpath>false</absoluteprojectpath>
     <description></description>
   </general>
-  <tdevcustomproject>
+  <kdevcustomproject>
     <run>
       <mainprogram>segfault</mainprogram>
       <directoryradio>executable</directoryradio>
@@ -38,8 +38,8 @@
         <default/>
       </environments>
     </make>
-  </tdevcustomproject>
-  <tdevdebugger>
+  </kdevcustomproject>
+  <kdevdebugger>
     <general>
       <dbgshell></dbgshell>
       <programargs></programargs>
@@ -56,8 +56,8 @@
       <demanglenames>true</demanglenames>
       <outputradix>10</outputradix>
     </display>
-  </tdevdebugger>
-  <tdevdoctreeview>
+  </kdevdebugger>
+  <kdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -102,16 +102,16 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
-  </tdevdoctreeview>
-  <tdevfilecreate>
+  </kdevdoctreeview>
+  <kdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </tdevfilecreate>
-  <tdevcppsupport>
+  </kdevfilecreate>
+  <kdevcppsupport>
     <references/>
     <codecompletion>
       <includeGlobalFunctions>true</includeGlobalFunctions>
@@ -143,8 +143,8 @@
       <synchronize>true</synchronize>
       <orientation>Vertical</orientation>
     </splitheadersource>
-  </tdevcppsupport>
-  <tdevfileview>
+  </kdevcppsupport>
+  <kdevfileview>
     <groups>
       <hidenonprojectfiles>false</hidenonprojectfiles>
       <hidenonlocation>false</hidenonlocation>
@@ -153,7 +153,7 @@
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
       <hidenonprojectfiles>false</hidenonprojectfiles>
     </tree>
-  </tdevfileview>
+  </kdevfileview>
   <cppsupportpart>
     <filetemplates>
       <interfacesuffix>.h</interfacesuffix>
diff --git a/languages/cpp/debugger/tests/threads/threads.tdevelop b/languages/cpp/debugger/tests/threads/threads.tdevelop
index c730bfc4..048b3aed 100644
--- a/languages/cpp/debugger/tests/threads/threads.tdevelop
+++ b/languages/cpp/debugger/tests/threads/threads.tdevelop
@@ -4,22 +4,22 @@
     <author>Vladimir Prus</author>
     <email>ghost@zigzag</email>
     <version>$VERSION$</version>
-    <projectmanagement>TDevCustomProject</projectmanagement>
+    <projectmanagement>KDevCustomProject</projectmanagement>
     <primarylanguage>C++</primarylanguage>
     <ignoreparts/>
   </general>
-  <tdevcustomproject>
+  <kdevcustomproject>
     <run>
       <mainprogram>threads</mainprogram>
       <directoryradio>executable</directoryradio>
     </run>
-  </tdevcustomproject>
-  <tdevdebugger>
+  </kdevcustomproject>
+  <kdevdebugger>
     <general>
       <dbgshell/>
     </general>
-  </tdevdebugger>
-  <tdevdoctreeview>
+  </kdevdebugger>
+  <kdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -64,16 +64,16 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
-  </tdevdoctreeview>
-  <tdevfilecreate>
+  </kdevdoctreeview>
+  <kdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </tdevfilecreate>
-  <tdevcppsupport>
+  </kdevfilecreate>
+  <kdevcppsupport>
     <references/>
     <codecompletion>
       <includeGlobalFunctions>true</includeGlobalFunctions>
@@ -87,8 +87,8 @@
       <argumentsHintDelay>400</argumentsHintDelay>
       <headerCompletionDelay>250</headerCompletionDelay>
     </codecompletion>
-  </tdevcppsupport>
-  <tdevfileview>
+  </kdevcppsupport>
+  <kdevfileview>
     <groups>
       <hidenonprojectfiles>false</hidenonprojectfiles>
       <hidenonlocation>false</hidenonlocation>
@@ -97,5 +97,5 @@
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
       <hidenonprojectfiles>false</hidenonprojectfiles>
     </tree>
-  </tdevfileview>
+  </kdevfileview>
 </tdevelop>
diff --git a/languages/cpp/debugger/tests/tracing/tracing.tdevelop b/languages/cpp/debugger/tests/tracing/tracing.tdevelop
index ab1846ef..56743de1 100644
--- a/languages/cpp/debugger/tests/tracing/tracing.tdevelop
+++ b/languages/cpp/debugger/tests/tracing/tracing.tdevelop
@@ -4,14 +4,14 @@
     <author>Vladimir Prus</author>
     <email>ghost@ghostwalk</email>
     <version>$VERSION$</version>
-    <projectmanagement>TDevCustomProject</projectmanagement>
+    <projectmanagement>KDevCustomProject</projectmanagement>
     <primarylanguage>C++</primarylanguage>
     <ignoreparts/>
     <projectdirectory>.</projectdirectory>
     <absoluteprojectpath>false</absoluteprojectpath>
     <description/>
   </general>
-  <tdevcustomproject>
+  <kdevcustomproject>
     <run>
       <mainprogram>tracing</mainprogram>
       <directoryradio>executable</directoryradio>
@@ -38,8 +38,8 @@
         <default/>
       </environments>
     </make>
-  </tdevcustomproject>
-  <tdevdebugger>
+  </kdevcustomproject>
+  <kdevdebugger>
     <general>
       <dbgshell/>
       <programargs/>
@@ -56,8 +56,8 @@
       <demanglenames>true</demanglenames>
       <outputradix>10</outputradix>
     </display>
-  </tdevdebugger>
-  <tdevdoctreeview>
+  </kdevdebugger>
+  <kdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -102,16 +102,16 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
-  </tdevdoctreeview>
-  <tdevfilecreate>
+  </kdevdoctreeview>
+  <kdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </tdevfilecreate>
-  <tdevcppsupport>
+  </kdevfilecreate>
+  <kdevcppsupport>
     <references/>
     <codecompletion>
       <includeGlobalFunctions>true</includeGlobalFunctions>
@@ -143,8 +143,8 @@
       <synchronize>true</synchronize>
       <orientation>Vertical</orientation>
     </splitheadersource>
-  </tdevcppsupport>
-  <tdevfileview>
+  </kdevcppsupport>
+  <kdevfileview>
     <groups>
       <hidenonprojectfiles>false</hidenonprojectfiles>
       <hidenonlocation>false</hidenonlocation>
@@ -153,7 +153,7 @@
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
       <hidenonprojectfiles>false</hidenonprojectfiles>
     </tree>
-  </tdevfileview>
+  </kdevfileview>
   <cppsupportpart>
     <filetemplates>
       <interfacesuffix>.h</interfacesuffix>
diff --git a/languages/cpp/debugger/tests/two_module/two_module.tdevelop b/languages/cpp/debugger/tests/two_module/two_module.tdevelop
index e4a9ae33..a6d22c2a 100644
--- a/languages/cpp/debugger/tests/two_module/two_module.tdevelop
+++ b/languages/cpp/debugger/tests/two_module/two_module.tdevelop
@@ -4,14 +4,14 @@
     <author>Vladimir Prus</author>
     <email>ghost@ghostwalk</email>
     <version>$VERSION$</version>
-    <projectmanagement>TDevCustomProject</projectmanagement>
+    <projectmanagement>KDevCustomProject</projectmanagement>
     <primarylanguage>C++</primarylanguage>
     <ignoreparts/>
     <projectdirectory>.</projectdirectory>
     <absoluteprojectpath>false</absoluteprojectpath>
     <description></description>
   </general>
-  <tdevcustomproject>
+  <kdevcustomproject>
     <run>
       <mainprogram>two_module</mainprogram>
       <directoryradio>executable</directoryradio>
@@ -38,8 +38,8 @@
         <default/>
       </environments>
     </make>
-  </tdevcustomproject>
-  <tdevdebugger>
+  </kdevcustomproject>
+  <kdevdebugger>
     <general>
       <dbgshell></dbgshell>
       <programargs></programargs>
@@ -56,8 +56,8 @@
       <demanglenames>true</demanglenames>
       <outputradix>10</outputradix>
     </display>
-  </tdevdebugger>
-  <tdevdoctreeview>
+  </kdevdebugger>
+  <kdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -102,16 +102,16 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
-  </tdevdoctreeview>
-  <tdevfilecreate>
+  </kdevdoctreeview>
+  <kdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </tdevfilecreate>
-  <tdevcppsupport>
+  </kdevfilecreate>
+  <kdevcppsupport>
     <references/>
     <codecompletion>
       <includeGlobalFunctions>true</includeGlobalFunctions>
@@ -143,8 +143,8 @@
       <synchronize>true</synchronize>
       <orientation>Vertical</orientation>
     </splitheadersource>
-  </tdevcppsupport>
-  <tdevfileview>
+  </kdevcppsupport>
+  <kdevfileview>
     <groups>
       <hidenonprojectfiles>false</hidenonprojectfiles>
       <hidenonlocation>false</hidenonlocation>
@@ -153,7 +153,7 @@
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
       <hidenonprojectfiles>false</hidenonprojectfiles>
     </tree>
-  </tdevfileview>
+  </kdevfileview>
   <cppsupportpart>
     <filetemplates>
       <interfacesuffix>.h</interfacesuffix>