Revert "Finish renaming tdevelop components"

This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73.

80 files changed, 284 insertions, 284 deletions

diff --git a/vcs/clearcase/CMakeLists.txt b/vcs/clearcase/CMakeLists.txt
index 94ca0536..4dbed390 100644
--- a/vcs/clearcase/CMakeLists.txt
+++ b/vcs/clearcase/CMakeLists.txt
@@ -27,15 +27,15 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevclearcase.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevclearcase.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### libtdevclearcase (module) #################
+##### libkdevclearcase (module) #################
 
-tde_add_kpart( libtdevclearcase AUTOMOC
+tde_add_kpart( libkdevclearcase AUTOMOC
   SOURCES
     clearcasepart.cpp commentdlg.cpp
     clearcasefileinfoprovider.cpp clearcasemanipulator.cpp
-  LINK tdevextensions-static tdevelop-shared
+  LINK kdevextensions-static tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/vcs/clearcase/Makefile.am b/vcs/clearcase/Makefile.am
index 36a2e7b6..630a1346 100644
--- a/vcs/clearcase/Makefile.am
+++ b/vcs/clearcase/Makefile.am
@@ -3,16 +3,16 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces \
 	-I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util $(all_includes)
 
-kde_module_LTLIBRARIES = libtdevclearcase.la
-libtdevclearcase_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevclearcase_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/interfaces/extensions/libtdevextensions.la
+kde_module_LTLIBRARIES = libkdevclearcase.la
+libkdevclearcase_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevclearcase_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la
 
-libtdevclearcase_la_SOURCES = clearcasepart.cpp commentdlg.cpp \
+libkdevclearcase_la_SOURCES = clearcasepart.cpp commentdlg.cpp \
 	clearcasefileinfoprovider.cpp clearcasemanipulator.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevclearcase.desktop
+service_DATA = kdevclearcase.desktop
 
 SUBDIRS = integrator
diff --git a/vcs/clearcase/clearcasefileinfoprovider.cpp b/vcs/clearcase/clearcasefileinfoprovider.cpp
index db7cbcc1..1e18f8e1 100644
--- a/vcs/clearcase/clearcasefileinfoprovider.cpp
+++ b/vcs/clearcase/clearcasefileinfoprovider.cpp
@@ -11,13 +11,13 @@
 //
 #include "clearcasefileinfoprovider.h"
 #include "clearcasepart.h"
-#include "tdevversioncontrol.h"
+#include "kdevversioncontrol.h"
 
 #include <kprocess.h>
 #include <tqapplication.h>
 
 ClearcaseFileinfoProvider::ClearcaseFileinfoProvider(ClearcasePart *parent)
-	: TDevVCSFileInfoProvider( (TDevVersionControl*) parent, "clearcasefileinfoprovider")
+	: KDevVCSFileInfoProvider( (KDevVersionControl*) parent, "clearcasefileinfoprovider")
 {
     vcsInfo_ = NULL;
 
diff --git a/vcs/clearcase/clearcasefileinfoprovider.h b/vcs/clearcase/clearcasefileinfoprovider.h
index 4c29da44..0f6f7d06 100644
--- a/vcs/clearcase/clearcasefileinfoprovider.h
+++ b/vcs/clearcase/clearcasefileinfoprovider.h
@@ -19,7 +19,7 @@
 /**
 @author KDevelop Authors
 */
-class ClearcaseFileinfoProvider : public TDevVCSFileInfoProvider
+class ClearcaseFileinfoProvider : public KDevVCSFileInfoProvider
 {
   Q_OBJECT
   
diff --git a/vcs/clearcase/clearcasemanipulator.h b/vcs/clearcase/clearcasemanipulator.h
index 42a5cee0..0cb795e3 100644
--- a/vcs/clearcase/clearcasemanipulator.h
+++ b/vcs/clearcase/clearcasemanipulator.h
@@ -12,7 +12,7 @@
 #ifndef CLEARCASEMANIPULATOR_H
 #define CLEARCASEMANIPULATOR_H
 
-#include "tdevversioncontrol.h"
+#include "kdevversioncontrol.h"
 
 #include <kprocess.h>
 
diff --git a/vcs/clearcase/clearcasepart.cpp b/vcs/clearcase/clearcasepart.cpp
index 338675d5..aeb1eea9 100644
--- a/vcs/clearcase/clearcasepart.cpp
+++ b/vcs/clearcase/clearcasepart.cpp
@@ -17,33 +17,33 @@
 
 #include <tdepopupmenu.h>
 #include <kdebug.h>
-#include <tdevgenericfactory.h>
+#include <kdevgenericfactory.h>
 #include <tdelocale.h>
 #include <kprocess.h>
 #include <tdemessagebox.h>
 #include <tdeapplication.h>
 
-#include "tdevcore.h"
-#include "tdevmakefrontend.h"
-#include "tdevdifffrontend.h"
-#include "tdevappfrontend.h"
+#include "kdevcore.h"
+#include "kdevmakefrontend.h"
+#include "kdevdifffrontend.h"
+#include "kdevappfrontend.h"
 #include "execcommand.h"
 #include "domutil.h"
-#include "tdevmainwindow.h"
-#include "tdevproject.h"
-#include "tdevplugininfo.h"
+#include "kdevmainwindow.h"
+#include "kdevproject.h"
+#include "kdevplugininfo.h"
 
 #include "clearcasefileinfoprovider.h"
 #include "clearcasemanipulator.h"
 
 
-static const TDevPluginInfo data("tdevclearcase");
+static const KDevPluginInfo data("kdevclearcase");
 
-typedef TDevGenericFactory<ClearcasePart> ClearcaseFactory;
-K_EXPORT_COMPONENT_FACTORY( libtdevclearcase, ClearcaseFactory( data ) )
+typedef KDevGenericFactory<ClearcasePart> ClearcaseFactory;
+K_EXPORT_COMPONENT_FACTORY( libkdevclearcase, ClearcaseFactory( data ) )
 
 ClearcasePart::ClearcasePart( TQObject *parent, const char *name, const TQStringList & )
-        : TDevVersionControl( &data, parent, name ? name : "ClearcasePart" ),
+        : KDevVersionControl( &data, parent, name ? name : "ClearcasePart" ),
           default_checkin(""),
           default_checkout(""),
           default_uncheckout("-rm"),
@@ -144,7 +144,7 @@ void ClearcasePart::slotCheckin()
     command += " ";
     command += KShellProcess::quote(name);
 
-    if (TDevMakeFrontend *makeFrontend = extension<TDevMakeFrontend>("TDevelop/MakeFrontend"))
+    if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
         makeFrontend->queueCommand(dir, command);
 }
 
@@ -176,7 +176,7 @@ void ClearcasePart::slotCheckout()
     command += " ";
     command += KShellProcess::quote(name);
 
-    if (TDevMakeFrontend *makeFrontend = extension<TDevMakeFrontend>("TDevelop/MakeFrontend"))
+    if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
         makeFrontend->queueCommand(dir, command);
 
     emit finishedFetching(dir);
@@ -199,7 +199,7 @@ void ClearcasePart::slotUncheckout()
     command += " ";
     command += KShellProcess::quote(name);
 
-    if (TDevMakeFrontend *makeFrontend = extension<TDevMakeFrontend>("TDevelop/MakeFrontend"))
+    if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
         makeFrontend->queueCommand(dir, command);
 
     emit finishedFetching(dir);
@@ -228,7 +228,7 @@ void ClearcasePart::slotCreate()
     command += " ";
     command += KShellProcess::quote(name);
 
-    if (TDevMakeFrontend *makeFrontend = extension<TDevMakeFrontend>("TDevelop/MakeFrontend"))
+    if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
         makeFrontend->queueCommand(dir, command);
 
     emit finishedFetching(dir);
@@ -255,7 +255,7 @@ void ClearcasePart::slotRemove()
     command += " ";
     command += KShellProcess::quote(name);
 
-    if (TDevMakeFrontend *makeFrontend = extension<TDevMakeFrontend>("TDevelop/MakeFrontend"))
+    if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
         makeFrontend->queueCommand(dir, command);
 
     emit finishedFetching(dir);
@@ -279,7 +279,7 @@ void ClearcasePart::slotListHistory()
     command += " ";
     command += KShellProcess::quote(name);
 
-    if (TDevMakeFrontend *makeFrontend = extension<TDevMakeFrontend>("TDevelop/MakeFrontend"))
+    if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
         makeFrontend->queueCommand(dir, command);
 }
 
@@ -333,7 +333,7 @@ void ClearcasePart::slotDiffFinished( const TQString& diff, const TQString& err
         return;
     }
 
-    if (TDevDiffFrontend *diffFrontend = extension<TDevDiffFrontend>("TDevelop/DiffFrontend"))
+    if (KDevDiffFrontend *diffFrontend = extension<KDevDiffFrontend>("TDevelop/DiffFrontend"))
         diffFrontend->showDiff( diff );
 }
 
@@ -354,7 +354,7 @@ void ClearcasePart::slotListCheckouts()
     command += " && cleartool lsco ";
     command += DomUtil::readEntry(dom, "/kdevclearcase/lscheckout_options", default_lscheckout);
 
-    if (TDevMakeFrontend *makeFrontend = extension<TDevMakeFrontend>("TDevelop/MakeFrontend"))
+    if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
         makeFrontend->queueCommand(dir, command);
 
 }
diff --git a/vcs/clearcase/clearcasepart.h b/vcs/clearcase/clearcasepart.h
index 52129141..be63e674 100644
--- a/vcs/clearcase/clearcasepart.h
+++ b/vcs/clearcase/clearcasepart.h
@@ -12,12 +12,12 @@
 #ifndef _CLEARCASEPART_H_
 #define _CLEARCASEPART_H_
 
-#include <tdevversioncontrol.h>
+#include <kdevversioncontrol.h>
 
 class Context;
 class TQPopupMenu;
 
-class ClearcasePart : public TDevVersionControl {
+class ClearcasePart : public KDevVersionControl {
     Q_OBJECT
   
 
@@ -36,7 +36,7 @@ public:
 
     virtual void createNewProject(const TQString& dir) {}
     virtual bool fetchFromRepository() { return true; }
-    virtual TDevVCSFileInfoProvider *fileInfoProvider() const { return fileInfoProvider_; }
+    virtual KDevVCSFileInfoProvider *fileInfoProvider() const { return fileInfoProvider_; }
     virtual bool isValidDirectory(const TQString &dirPath) const;
 
 private slots:
@@ -60,7 +60,7 @@ private:
     TQString popupfile_;
     TQString viewname;
 
-    TDevVCSFileInfoProvider *fileInfoProvider_;
+    KDevVCSFileInfoProvider *fileInfoProvider_;
 };
 
 #endif
diff --git a/vcs/clearcase/integrator/CMakeLists.txt b/vcs/clearcase/integrator/CMakeLists.txt
index bd527272..ccc3348f 100644
--- a/vcs/clearcase/integrator/CMakeLists.txt
+++ b/vcs/clearcase/integrator/CMakeLists.txt
@@ -26,7 +26,7 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevclearcaseintegrator.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevclearcaseintegrator.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
 ##### libclearcaseintegrator (module) ###########
@@ -35,6 +35,6 @@ tde_add_kpart( libclearcaseintegrator AUTOMOC
   SOURCES
     clearcaseintegrator.cpp ccintegratordlgbase.ui
     ccintegratordlg.cpp
-  LINK tdevextras-shared tdevelop-shared
+  LINK kdevextras-shared tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/vcs/clearcase/integrator/Makefile.am b/vcs/clearcase/integrator/Makefile.am
index 98e39465..a9d50a98 100644
--- a/vcs/clearcase/integrator/Makefile.am
+++ b/vcs/clearcase/integrator/Makefile.am
@@ -5,9 +5,9 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES = libclearcaseintegrator.la
 libclearcaseintegrator_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries)
 libclearcaseintegrator_la_LIBADD =\
-	$(top_builddir)/lib/interfaces/extras/libtdevextras.la\
+	$(top_builddir)/lib/interfaces/extras/libkdevextras.la\
 	$(top_builddir)/lib/libtdevelop.la
-kde_services_DATA = tdevclearcaseintegrator.desktop
+kde_services_DATA = kdevclearcaseintegrator.desktop
 noinst_HEADERS = clearcaseintegrator.h ccintegratordlg.h
 libclearcaseintegrator_la_SOURCES = clearcaseintegrator.cpp \
 	ccintegratordlgbase.ui ccintegratordlg.cpp
diff --git a/vcs/clearcase/integrator/ccintegratordlg.h b/vcs/clearcase/integrator/ccintegratordlg.h
index 2eb1e2e3..f427b2b3 100644
--- a/vcs/clearcase/integrator/ccintegratordlg.h
+++ b/vcs/clearcase/integrator/ccintegratordlg.h
@@ -21,7 +21,7 @@
 #define CCINTEGRATORDLG_H
 
 #include "ccintegratordlgbase.h"
-#include <tdevvcsintegrator.h>
+#include <kdevvcsintegrator.h>
 
 class CCIntegratorDlg: public CCIntegratorDlgBase, public VCSDialog {
 Q_OBJECT
diff --git a/vcs/clearcase/integrator/clearcaseintegrator.cpp b/vcs/clearcase/integrator/clearcaseintegrator.cpp
index f00783b4..4e8c1a0b 100644
--- a/vcs/clearcase/integrator/clearcaseintegrator.cpp
+++ b/vcs/clearcase/integrator/clearcaseintegrator.cpp
@@ -19,19 +19,19 @@
  ***************************************************************************/
 #include "clearcaseintegrator.h"
 
-#include <tdevgenericfactory.h>
-#include <tdevplugininfo.h>
+#include <kdevgenericfactory.h>
+#include <kdevplugininfo.h>
 
 #include "ccintegratordlg.h"
 
-static const TDevPluginInfo data("tdevclearcaseintegrator");
-typedef TDevGenericFactory<ClearcaseIntegrator> ClearcaseIntegratorFactory;
+static const KDevPluginInfo data("kdevclearcaseintegrator");
+typedef KDevGenericFactory<ClearcaseIntegrator> ClearcaseIntegratorFactory;
 K_EXPORT_COMPONENT_FACTORY( libclearcaseintegrator, ClearcaseIntegratorFactory(data) )
 
 ClearcaseIntegrator::ClearcaseIntegrator(TQObject* parent, const char* name,
     const TQStringList // args
                                          )
-    :TDevVCSIntegrator(parent, name)
+    :KDevVCSIntegrator(parent, name)
 {
 }
 
diff --git a/vcs/clearcase/integrator/clearcaseintegrator.h b/vcs/clearcase/integrator/clearcaseintegrator.h
index 4e431da6..3859c1f9 100644
--- a/vcs/clearcase/integrator/clearcaseintegrator.h
+++ b/vcs/clearcase/integrator/clearcaseintegrator.h
@@ -20,11 +20,11 @@
 #ifndef CLEARCASEINTEGRATOR_H
 #define CLEARCASEINTEGRATOR_H
 
-#include <tdevvcsintegrator.h>
+#include <kdevvcsintegrator.h>
 
 #include <tqstringlist.h>
 
-class ClearcaseIntegrator : public TDevVCSIntegrator
+class ClearcaseIntegrator : public KDevVCSIntegrator
 {
 Q_OBJECT
   
diff --git a/vcs/clearcase/integrator/tdevclearcaseintegrator.desktop b/vcs/clearcase/integrator/kdevclearcaseintegrator.desktop
index 4bc49cfc..4bc49cfc 100644
--- a/vcs/clearcase/integrator/tdevclearcaseintegrator.desktop
+++ b/vcs/clearcase/integrator/kdevclearcaseintegrator.desktop
diff --git a/vcs/clearcase/tdevclearcase.desktop b/vcs/clearcase/kdevclearcase.desktop
index 687e5c67..9b3df9df 100644
--- a/vcs/clearcase/tdevclearcase.desktop
+++ b/vcs/clearcase/kdevclearcase.desktop
@@ -77,6 +77,6 @@ GenericName[tr]=ClearCase Bütünleştirmesi
 GenericName[zh_CN]=ClearCase集成
 GenericName[zh_TW]=ClearCase 整合
 ServiceTypes=TDevelop/VersionControl
-X-TDE-Library=libtdevclearcase
+X-TDE-Library=libkdevclearcase
 X-TDevelop-Version=5
 X-TDevelop-Properties=VCS,ClearcaseVCS
diff --git a/vcs/cvsservice/CMakeLists.txt b/vcs/cvsservice/CMakeLists.txt
index c8cd2b35..dc50d646 100644
--- a/vcs/cvsservice/CMakeLists.txt
+++ b/vcs/cvsservice/CMakeLists.txt
@@ -30,14 +30,14 @@ link_directories(
 ##### other data ################################
 
 tde_install_icons( )
-install( FILES tdevcvsservice.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES tdev_cvs.png DESTINATION ${DATA_INSTALL_DIR}/tdevcvsservice/pics )
-install( FILES buildcvs.sh DESTINATION ${DATA_INSTALL_DIR}/tdevcvsservice )
+install( FILES kdevcvsservice.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdev_cvs.png DESTINATION ${DATA_INSTALL_DIR}/kdevcvsservice/pics )
+install( FILES buildcvs.sh DESTINATION ${DATA_INSTALL_DIR}/kdevcvsservice )
 
 
-##### libtdevcvsservice (module) ################
+##### libkdevcvsservice (module) ################
 
-tde_add_kpart( libtdevcvsservice AUTOMOC
+tde_add_kpart( libkdevcvsservice AUTOMOC
   SOURCES
     cvspart.cpp cvspartimpl.cpp cvsformbase.ui cvsform.cpp
     commitdialogbase.ui commitdlg.cpp cvsoptionswidgetbase.ui
@@ -52,7 +52,7 @@ tde_add_kpart( libtdevcvsservice AUTOMOC
     editorsdialogbase.ui editorsdialog.cpp annotatedialog.cpp
     annotatepage.cpp annotateview.cpp
   LINK
-    tdevextensions-static tdevwidgets-shared tdevelop-shared
+    kdevextensions-static kdevwidgets-shared tdevelop-shared
     cvsservice tdehtml-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/vcs/cvsservice/Makefile.am b/vcs/cvsservice/Makefile.am
index 3ce9dc40..63560056 100644
--- a/vcs/cvsservice/Makefile.am
+++ b/vcs/cvsservice/Makefile.am
@@ -3,12 +3,12 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces \
 	-I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util -I$(top_srcdir)/lib/widgets $(all_includes) -I$(kde_includes)/tde
 
-kde_module_LTLIBRARIES = libtdevcvsservice.la
-libtdevcvsservice_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevcvsservice_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
-	$(top_builddir)/lib/widgets/libtdevwidgets.la $(LIB_TDEHTML) -lcvsservice $(top_builddir)/lib/interfaces/extensions/libtdevextensions.la
+kde_module_LTLIBRARIES = libkdevcvsservice.la
+libkdevcvsservice_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevcvsservice_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
+	$(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_TDEHTML) -lcvsservice $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la
 
-libtdevcvsservice_la_SOURCES = cvspart.cpp cvspartimpl.cpp cvsformbase.ui \
+libkdevcvsservice_la_SOURCES = cvspart.cpp cvspartimpl.cpp cvsformbase.ui \
 	cvsform.cpp commitdialogbase.ui commitdlg.cpp cvsoptionswidgetbase.ui \
 	cvsoptionswidget.cpp cvsprocesswidget.cpp cvsentry.cpp cvsdir.cpp changelog.cpp \
 	cvsoptions.cpp checkoutdialogbase.ui checkoutdialog.cpp tagdialog.cpp tagdialogbase.ui \
@@ -29,12 +29,12 @@ METASOURCES = AUTO
 ICONS = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevcvsservice.desktop
+service_DATA = kdevcvsservice.desktop
 
-servicepicsdir = $(kde_datadir)/tdevcvsservice/pics
-servicepics_DATA = tdev_cvs.png
+servicepicsdir = $(kde_datadir)/kdevcvsservice/pics
+servicepics_DATA = kdev_cvs.png
 
-rcdir = $(kde_datadir)/tdevcvsservice
+rcdir = $(kde_datadir)/kdevcvsservice
 rc_DATA = buildcvs.sh
 
 SUBDIRS = integrator
diff --git a/vcs/cvsservice/README.dox b/vcs/cvsservice/README.dox
index bb6dfd60..1ff0b528 100644
--- a/vcs/cvsservice/README.dox
+++ b/vcs/cvsservice/README.dox
@@ -37,7 +37,7 @@ Implementation of this component is done by:
     one wants to perform: exception to this are the cvslog* classes which do start
     cvs jobs independently archiving parallelism with the CvsProcesssWidget.
   - CVSDir and CVSEntry provide abstraction for accessing to local CVS information
-  - CVSFileInfoProvider is an implementation of TDevVCSFileInfoProvider interface
+  - CVSFileInfoProvider is an implementation of KDevVCSFileInfoProvider interface
     and collects data about files stats: for CVS, both synch (fetch data from local sandbox)
     and asynch (fetch from repository server) are working with some minor bugs in the parsing
     of 'cvs status' output for the latter. (Sync means that information are collected
diff --git a/vcs/cvsservice/bufferedstringreader.h b/vcs/cvsservice/bufferedstringreader.h
index 05ce6ad6..c7548b59 100644
--- a/vcs/cvsservice/bufferedstringreader.h
+++ b/vcs/cvsservice/bufferedstringreader.h
@@ -16,7 +16,7 @@
 
 class CvsServicePart;
 class TDEConfig;
-class TDevProject;
+class KDevProject;
 
 /* This class helps when we have to collect a string list from a text
  * stream, just as many cvs commands do. The problem is that the these commands
diff --git a/vcs/cvsservice/cvsentry.h b/vcs/cvsservice/cvsentry.h
index d4e51de8..9a2e4d6d 100644
--- a/vcs/cvsservice/cvsentry.h
+++ b/vcs/cvsservice/cvsentry.h
@@ -15,7 +15,7 @@
 
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <tdevversioncontrol.h>
+#include <kdevversioncontrol.h>
 
 class CVSDir;
 
diff --git a/vcs/cvsservice/cvsfileinfoprovider.cpp b/vcs/cvsservice/cvsfileinfoprovider.cpp
index 2e0c960a..cbfc726f 100644
--- a/vcs/cvsservice/cvsfileinfoprovider.cpp
+++ b/vcs/cvsservice/cvsfileinfoprovider.cpp
@@ -15,7 +15,7 @@
 #include <kdebug.h>
 
 #include <urlutil.h>
-#include <tdevproject.h>
+#include <kdevproject.h>
 
 #include <dcopref.h>
 #include <cvsjob_stub.h>
@@ -32,7 +32,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 CVSFileInfoProvider::CVSFileInfoProvider( CvsServicePart *parent, CvsService_stub *cvsService )
-    : TDevVCSFileInfoProvider( parent, "cvsfileinfoprovider" ),
+    : KDevVCSFileInfoProvider( parent, "cvsfileinfoprovider" ),
     m_requestStatusJob( 0 ), m_cvsService( cvsService ), m_cachedDirEntries( 0 )
 {
     connect( this, TQT_SIGNAL(needStatusUpdate(const CVSDir&)), this, TQT_SLOT(updateStatusFor(const CVSDir&)));
diff --git a/vcs/cvsservice/cvsfileinfoprovider.h b/vcs/cvsservice/cvsfileinfoprovider.h
index 09b7b9b8..8bc3a6fe 100644
--- a/vcs/cvsservice/cvsfileinfoprovider.h
+++ b/vcs/cvsservice/cvsfileinfoprovider.h
@@ -14,7 +14,7 @@
 
 #include <tqmap.h>
 
-#include <tdevversioncontrol.h>
+#include <kdevversioncontrol.h>
 #include "cvsservicedcopIface.h"
 #include "cvsdir.h"
 #include "bufferedstringreader.h"
@@ -28,7 +28,7 @@ Provider for CVS file information
 
 @author Mario Scalas
 */
-class CVSFileInfoProvider : public TDevVCSFileInfoProvider, virtual public CVSServiceDCOPIface
+class CVSFileInfoProvider : public KDevVCSFileInfoProvider, virtual public CVSServiceDCOPIface
 {
     Q_OBJECT
   
diff --git a/vcs/cvsservice/cvsoptions.cpp b/vcs/cvsservice/cvsoptions.cpp
index 6511a38f..2cdf5c92 100644
--- a/vcs/cvsservice/cvsoptions.cpp
+++ b/vcs/cvsservice/cvsoptions.cpp
@@ -17,7 +17,7 @@
 #include <tdelocale.h>
 
 #include "domutil.h"
-#include "tdevproject.h"
+#include "kdevproject.h"
 #include "cvsoptions.h"
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -80,9 +80,9 @@ CvsOptions* CvsOptions::instance()
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void CvsOptions::save( TDevProject *project )
+void CvsOptions::save( KDevProject *project )
 {
-    kdDebug( 9006 ) << " **** CvsOptions::save( TDevProject* ) here" << endl;
+    kdDebug( 9006 ) << " **** CvsOptions::save( KDevProject* ) here" << endl;
     Q_ASSERT( project );
 
     TQDomDocument &dom = *project->projectDom();
@@ -105,9 +105,9 @@ void CvsOptions::save( TDevProject *project )
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void CvsOptions::load( TDevProject *project )
+void CvsOptions::load( KDevProject *project )
 {
-    kdDebug( 9006 ) << " **** CvsOptions::load( TDevProject* ) here" << endl;
+    kdDebug( 9006 ) << " **** CvsOptions::load( KDevProject* ) here" << endl;
     Q_ASSERT( project );
     TQDomDocument &dom = *project->projectDom();
 
diff --git a/vcs/cvsservice/cvsoptions.h b/vcs/cvsservice/cvsoptions.h
index f54e6273..c4daf301 100644
--- a/vcs/cvsservice/cvsoptions.h
+++ b/vcs/cvsservice/cvsoptions.h
@@ -17,7 +17,7 @@
 
 class CvsServicePart;
 class TDEConfig;
-class TDevProject;
+class KDevProject;
 
 /* This class represents the command line options for the used cvs commands.
  * It uses the singleton pattern.
@@ -32,9 +32,9 @@ public:
 
     virtual ~CvsOptions();
 
-    void save( TDevProject *project );
+    void save( KDevProject *project );
     /// \FIXME parameter should be const!!
-    void load( TDevProject *project );
+    void load( KDevProject *project );
 
     void setRecursiveWhenCommitRemove( bool b );
     bool recursiveWhenCommitRemove() const;
diff --git a/vcs/cvsservice/cvspart.cpp b/vcs/cvsservice/cvspart.cpp
index 276a4d15..2bda55f1 100644
--- a/vcs/cvsservice/cvspart.cpp
+++ b/vcs/cvsservice/cvspart.cpp
@@ -37,17 +37,17 @@
 #include <cvsjob_stub.h>
 
 #include <tdeparts/part.h>
-#include <tdevpartcontroller.h>
-#include <tdevgenericfactory.h>
-
-#include "tdevcore.h"
-#include "tdevmakefrontend.h"
-#include "tdevdifffrontend.h"
-#include "tdevappfrontend.h"
-#include "tdevplugininfo.h"
+#include <kdevpartcontroller.h>
+#include <kdevgenericfactory.h>
+
+#include "kdevcore.h"
+#include "kdevmakefrontend.h"
+#include "kdevdifffrontend.h"
+#include "kdevappfrontend.h"
+#include "kdevplugininfo.h"
 #include "domutil.h"
-#include "tdevmainwindow.h"
-#include "tdevproject.h"
+#include "kdevmainwindow.h"
+#include "kdevproject.h"
 #include "urlutil.h"
 
 #include "cvsform.h"
@@ -72,16 +72,16 @@ bool g_projectWasJustCreated = false;
 // Plugin factory
 ///////////////////////////////////////////////////////////////////////////////
 
-static const TDevPluginInfo data("tdevcvsservice");
-typedef TDevGenericFactory<CvsServicePart> CvsFactory;
-K_EXPORT_COMPONENT_FACTORY( libtdevcvsservice, CvsFactory( data ) )
+static const KDevPluginInfo data("kdevcvsservice");
+typedef KDevGenericFactory<CvsServicePart> CvsFactory;
+K_EXPORT_COMPONENT_FACTORY( libkdevcvsservice, CvsFactory( data ) )
 
 ///////////////////////////////////////////////////////////////////////////////
 // class CvsServicePart
 ///////////////////////////////////////////////////////////////////////////////
 
 CvsServicePart::CvsServicePart( TQObject *parent, const char *name, const TQStringList & )
-	: TDevVersionControl( &data, parent,
+	: KDevVersionControl( &data, parent,
 						  name ? name : "CvsService" ),
     actionCommit( 0 ), actionDiff( 0 ), actionLog( 0 ), actionAnnotate(0), actionAdd( 0 ),
     actionAddBinary( 0 ), actionRemove( 0 ), actionUpdate( 0 ),
@@ -126,10 +126,10 @@ void CvsServicePart::init()
         this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) );
     connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)),
         this, TQT_SLOT(projectConfigWidget(KDialogBase*)) );
-    connect( core(), TQT_SIGNAL(stopButtonClicked(TDevPlugin*)),
-        this, TQT_SLOT(slotStopButtonClicked(TDevPlugin*)) );
+    connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)),
+        this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) );
 
-    m_impl->m_widget->setIcon( UserIcon( "tdev_cvs", TDEIcon::DefaultState, CvsFactory::instance()) );
+    m_impl->m_widget->setIcon( UserIcon( "kdev_cvs", TDEIcon::DefaultState, CvsFactory::instance()) );
     TQWhatsThis::add( m_impl->processWidget(), i18n("<b>CVS</b><p>Concurrent Versions System operations window. Shows output of Cervisia CVS Service.") );
     m_impl->processWidget()->setCaption(i18n("CvsService Output"));
     mainWindow()->embedOutputView( m_impl->processWidget(), i18n("CvsService"), i18n("cvs output") );
@@ -243,7 +243,7 @@ bool CvsServicePart::fetchFromRepository()
 
 ///////////////////////////////////////////////////////////////////////////////
 
-TDevVCSFileInfoProvider *CvsServicePart::fileInfoProvider() const
+KDevVCSFileInfoProvider *CvsServicePart::fileInfoProvider() const
 {
     return m_impl->fileInfoProvider();
 }
@@ -704,7 +704,7 @@ void CvsServicePart::slotRemoveFromIgnoreList()
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void CvsServicePart::slotStopButtonClicked( TDevPlugin* which )
+void CvsServicePart::slotStopButtonClicked( KDevPlugin* which )
 {
     if ( which != 0 && which != this )
         return;
diff --git a/vcs/cvsservice/cvspart.h b/vcs/cvsservice/cvspart.h
index 61015fda..e2df8ce0 100644
--- a/vcs/cvsservice/cvspart.h
+++ b/vcs/cvsservice/cvspart.h
@@ -17,7 +17,7 @@
 #include <tqguardedptr.h>
 #include <tqcstring.h>
 #include <kurl.h>
-#include "tdevversioncontrol.h"
+#include "kdevversioncontrol.h"
 
 class Context;
 class TQPopupMenu;
@@ -34,7 +34,7 @@ class CvsService_stub;
 class Repository_stub;
 class CvsServicePartImpl;
 
-class CvsServicePart : public TDevVersionControl
+class CvsServicePart : public KDevVersionControl
 {
     Q_OBJECT
   
@@ -63,7 +63,7 @@ public:
     /**
     * @return the info provider for VCS sandboxes
     */
-    virtual TDevVCSFileInfoProvider *fileInfoProvider() const;
+    virtual KDevVCSFileInfoProvider *fileInfoProvider() const;
     /**
     * @param dirPath absolute path of the directory
     * @return true if the the directory is a valid CVS sandbox
@@ -129,7 +129,7 @@ private slots:
     void projectConfigWidget( KDialogBase *dlg );
 
     //! Called when the user wishes to stop an operation.
-    void slotStopButtonClicked( TDevPlugin* );
+    void slotStopButtonClicked( KDevPlugin* );
 
 private slots:
     void init();
diff --git a/vcs/cvsservice/cvspartimpl.cpp b/vcs/cvsservice/cvspartimpl.cpp
index 112ea997..01c85df3 100644
--- a/vcs/cvsservice/cvspartimpl.cpp
+++ b/vcs/cvsservice/cvspartimpl.cpp
@@ -29,12 +29,12 @@
 #include <cvsjob_stub.h>
 // KDevelop SDK stuff
 #include <urlutil.h>
-#include <tdevproject.h>
-#include <tdevmainwindow.h>
-#include <tdevcore.h>
-#include <tdevdifffrontend.h>
-#include <tdevmakefrontend.h>
-#include <tdevpartcontroller.h>
+#include <kdevproject.h>
+#include <kdevmainwindow.h>
+#include <kdevcore.h>
+#include <kdevdifffrontend.h>
+#include <kdevmakefrontend.h>
+#include <kdevpartcontroller.h>
 // Part's widgets
 #include "cvsprocesswidget.h"
 #include "checkoutdialog.h"
@@ -309,7 +309,7 @@ CvsProcessWidget *CvsServicePartImpl::processWidget() const
 
 ///////////////////////////////////////////////////////////////////////////////
 
-TDevMainWindow *CvsServicePartImpl::mainWindow() const
+KDevMainWindow *CvsServicePartImpl::mainWindow() const
 {
     return m_part->mainWindow();
 }
@@ -323,16 +323,16 @@ TQString CvsServicePartImpl::projectDirectory() const
 
 ///////////////////////////////////////////////////////////////////////////////
 
-TDevCore *CvsServicePartImpl::core() const
+KDevCore *CvsServicePartImpl::core() const
 {
     return m_part->core();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-TDevDiffFrontend *CvsServicePartImpl::diffFrontend() const
+KDevDiffFrontend *CvsServicePartImpl::diffFrontend() const
 {
-    return m_part->extension<TDevDiffFrontend>("TDevelop/DiffFrontend");
+    return m_part->extension<KDevDiffFrontend>("TDevelop/DiffFrontend");
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -774,7 +774,7 @@ void CvsServicePartImpl::createNewProject( const TQString &dirName,
     kdDebug( 9006 ) << "  ** Will run the following command: " << endl << cmdLine << endl;
     kdDebug( 9006 ) << "  ** on directory: " << dirName << endl;
 
-    if (TDevMakeFrontend *makeFrontend = m_part->extension<TDevMakeFrontend>("TDevelop/MakeFrontend"))
+    if (KDevMakeFrontend *makeFrontend = m_part->extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
         makeFrontend->queueCommand( dirName, cmdLine );
 }
 
@@ -902,7 +902,7 @@ void CvsServicePartImpl::emitFileStateModified( const KURL::List &/*urls*/, VCSF
 
 ///////////////////////////////////////////////////////////////////////////////
 
-TDevVCSFileInfoProvider *CvsServicePartImpl::fileInfoProvider() const
+KDevVCSFileInfoProvider *CvsServicePartImpl::fileInfoProvider() const
 {
     return m_fileInfoProvider;
 }
diff --git a/vcs/cvsservice/cvspartimpl.h b/vcs/cvsservice/cvspartimpl.h
index 32ee04f5..ade7ffe4 100644
--- a/vcs/cvsservice/cvspartimpl.h
+++ b/vcs/cvsservice/cvspartimpl.h
@@ -17,18 +17,18 @@
 #include <tqguardedptr.h>
 #include <kurl.h>
 
-#include <tdevversioncontrol.h>
+#include <kdevversioncontrol.h>
 
 class CvsServicePart;
 class KDialogBase;
 class KURL;
 class CvsProcessWidget;
-class TDevMainWindow;
-class TDevCore;
-class TDevDiffFrontend;
+class KDevMainWindow;
+class KDevCore;
+class KDevDiffFrontend;
 class TQDir;
 class JobScheduler;
-class TDevVCSFileInfoProvider;
+class KDevVCSFileInfoProvider;
 class CVSFileInfoProvider;
 
 /**
@@ -183,7 +183,7 @@ public:
     /**
     * @return a reference to the custom FileInforProvider object (FORWARDER)
     */
-    TDevVCSFileInfoProvider *fileInfoProvider() const;
+    KDevVCSFileInfoProvider *fileInfoProvider() const;
 
 
 // Helpers
@@ -309,10 +309,10 @@ private:
     static const TQString changeLogPrependString;
 
     // Internal short-cuts
-    TDevMainWindow *mainWindow() const;
-    TDevCore *core() const;
+    KDevMainWindow *mainWindow() const;
+    KDevCore *core() const;
     TQString projectDirectory() const;
-    TDevDiffFrontend *diffFrontend() const;
+    KDevDiffFrontend *diffFrontend() const;
 
     /** Locate and setup DCOP CvsService */
     bool requestCvsService();
diff --git a/vcs/cvsservice/cvsprocesswidget.cpp b/vcs/cvsservice/cvsprocesswidget.cpp
index e218e00e..bb8fb459 100644
--- a/vcs/cvsservice/cvsprocesswidget.cpp
+++ b/vcs/cvsservice/cvsprocesswidget.cpp
@@ -18,9 +18,9 @@
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 
-#include "tdevpartcontroller.h"
-#include "tdevmainwindow.h"
-#include "tdevcore.h"
+#include "kdevpartcontroller.h"
+#include "kdevmainwindow.h"
+#include "kdevcore.h"
 
 #include "cvspart.h"
 #include "cvsprocesswidget.h"
diff --git a/vcs/cvsservice/integrator/CMakeLists.txt b/vcs/cvsservice/integrator/CMakeLists.txt
index e615784e..a17393d8 100644
--- a/vcs/cvsservice/integrator/CMakeLists.txt
+++ b/vcs/cvsservice/integrator/CMakeLists.txt
@@ -25,7 +25,7 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevcvsserviceintegrator.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevcvsserviceintegrator.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
 ##### libcvsserviceintegrator (module) ##########
@@ -35,6 +35,6 @@ tde_add_kpart( libcvsserviceintegrator AUTOMOC
     cvsserviceintegrator.cpp integratordlgbase.ui
     fetcherdlgbase.ui integratordlg.cpp initdlg.ui
   LINK
-    tdevextras-shared tdevelop-shared cvsservice
+    kdevextras-shared tdevelop-shared cvsservice
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/vcs/cvsservice/integrator/Makefile.am b/vcs/cvsservice/integrator/Makefile.am
index 36f5dcee..f3eb47fe 100644
--- a/vcs/cvsservice/integrator/Makefile.am
+++ b/vcs/cvsservice/integrator/Makefile.am
@@ -5,8 +5,8 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES = libcvsserviceintegrator.la
 libcvsserviceintegrator_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries)
 libcvsserviceintegrator_la_LIBADD = \
-	$(top_builddir)/lib/interfaces/extras/libtdevextras.la $(top_builddir)/lib/libtdevelop.la -lcvsservice
+	$(top_builddir)/lib/interfaces/extras/libkdevextras.la $(top_builddir)/lib/libtdevelop.la -lcvsservice
 noinst_HEADERS = cvsserviceintegrator.h integratordlg.h
 libcvsserviceintegrator_la_SOURCES = cvsserviceintegrator.cpp \
 	integratordlgbase.ui fetcherdlgbase.ui integratordlg.cpp initdlg.ui
-kde_services_DATA = tdevcvsserviceintegrator.desktop
+kde_services_DATA = kdevcvsserviceintegrator.desktop
diff --git a/vcs/cvsservice/integrator/cvsserviceintegrator.cpp b/vcs/cvsservice/integrator/cvsserviceintegrator.cpp
index 7f2fbbeb..1bbc3b11 100644
--- a/vcs/cvsservice/integrator/cvsserviceintegrator.cpp
+++ b/vcs/cvsservice/integrator/cvsserviceintegrator.cpp
@@ -19,18 +19,18 @@
  ***************************************************************************/
 #include "cvsserviceintegrator.h"
 
-#include <tdevgenericfactory.h>
-#include <tdevplugininfo.h>
+#include <kdevgenericfactory.h>
+#include <kdevplugininfo.h>
 
 #include "integratordlg.h"
 
-static const TDevPluginInfo data("tdevcvsserviceintegrator");
-typedef TDevGenericFactory<CVSServiceIntegrator> CVSIntegratorFactory;
+static const KDevPluginInfo data("kdevcvsserviceintegrator");
+typedef KDevGenericFactory<CVSServiceIntegrator> CVSIntegratorFactory;
 K_EXPORT_COMPONENT_FACTORY( libcvsserviceintegrator, CVSIntegratorFactory(data) )
 
 CVSServiceIntegrator::CVSServiceIntegrator(TQObject* parent, const char* name, 
     const TQStringList args)
-    :TDevVCSIntegrator(parent, name)
+    :KDevVCSIntegrator(parent, name)
 {
 }
 
diff --git a/vcs/cvsservice/integrator/cvsserviceintegrator.h b/vcs/cvsservice/integrator/cvsserviceintegrator.h
index b3a8af9a..ebf4224e 100644
--- a/vcs/cvsservice/integrator/cvsserviceintegrator.h
+++ b/vcs/cvsservice/integrator/cvsserviceintegrator.h
@@ -20,11 +20,11 @@
 #ifndef CVSSERVICEINTEGRATOR_H
 #define CVSSERVICEINTEGRATOR_H
 
-#include <tdevvcsintegrator.h>
+#include <kdevvcsintegrator.h>
 
 #include <tqstringlist.h>
 
-class CVSServiceIntegrator: public TDevVCSIntegrator {
+class CVSServiceIntegrator: public KDevVCSIntegrator {
 Q_OBJECT
   
 public:
diff --git a/vcs/cvsservice/integrator/tdevcvsserviceintegrator.desktop b/vcs/cvsservice/integrator/kdevcvsserviceintegrator.desktop
index a6f189f7..a6f189f7 100644
--- a/vcs/cvsservice/integrator/tdevcvsserviceintegrator.desktop
+++ b/vcs/cvsservice/integrator/kdevcvsserviceintegrator.desktop
diff --git a/vcs/cvsservice/tdev_cvs.png b/vcs/cvsservice/kdev_cvs.png
index 921b0674..921b0674 100644
--- a/vcs/cvsservice/tdev_cvs.png
+++ b/vcs/cvsservice/kdev_cvs.png
diff --git a/vcs/cvsservice/tdev_cvs.xcf b/vcs/cvsservice/kdev_cvs.xcf
index aafee609..aafee609 100644
--- a/vcs/cvsservice/tdev_cvs.xcf
+++ b/vcs/cvsservice/kdev_cvs.xcf
diff --git a/vcs/cvsservice/tdevcvsservice.desktop b/vcs/cvsservice/kdevcvsservice.desktop
index 5b8bb530..921e91d1 100644
--- a/vcs/cvsservice/tdevcvsservice.desktop
+++ b/vcs/cvsservice/kdevcvsservice.desktop
@@ -72,6 +72,6 @@ GenericName[zh_CN]=CVS 集成(Cervisia)
 GenericName[zh_TW]=CVS 整合（Cervisia）
 Icon=cervisia
 ServiceTypes=TDevelop/VersionControl
-X-TDE-Library=libtdevcvsservice
+X-TDE-Library=libkdevcvsservice
 X-TDevelop-Version=5
 X-TDevelop-Properties=VCS,CVSService
diff --git a/vcs/cvsservice/tdevcvsservicepart.rc b/vcs/cvsservice/kdevcvsservicepart.rc
index a1bce434..a1bce434 100644
--- a/vcs/cvsservice/tdevcvsservicepart.rc
+++ b/vcs/cvsservice/kdevcvsservicepart.rc
diff --git a/vcs/perforce/CMakeLists.txt b/vcs/perforce/CMakeLists.txt
index f0964379..549eadb8 100644
--- a/vcs/perforce/CMakeLists.txt
+++ b/vcs/perforce/CMakeLists.txt
@@ -27,13 +27,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevperforce.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevperforce.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### libtdevperforce (module) ##################
+##### libkdevperforce (module) ##################
 
-tde_add_kpart( libtdevperforce AUTOMOC
+tde_add_kpart( libkdevperforce AUTOMOC
   SOURCES perforcepart.cpp commitdlg.cpp
-  LINK tdevextensions-static tdevelop-shared
+  LINK kdevextensions-static tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/vcs/perforce/Makefile.am b/vcs/perforce/Makefile.am
index 09fb0e9e..36e19325 100644
--- a/vcs/perforce/Makefile.am
+++ b/vcs/perforce/Makefile.am
@@ -3,17 +3,17 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces \
 	-I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util $(all_includes)
 
-kde_module_LTLIBRARIES = libtdevperforce.la
-libtdevperforce_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevperforce_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/interfaces/extensions/libtdevextensions.la
+kde_module_LTLIBRARIES = libkdevperforce.la
+libkdevperforce_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevperforce_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la
 
-libtdevperforce_la_SOURCES = perforcepart.cpp commitdlg.cpp
+libkdevperforce_la_SOURCES = perforcepart.cpp commitdlg.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevperforce.desktop
+service_DATA = kdevperforce.desktop
 
-rcdir = $(kde_datadir)/tdevperforce
+rcdir = $(kde_datadir)/kdevperforce
 
 SUBDIRS = integrator
diff --git a/vcs/perforce/integrator/CMakeLists.txt b/vcs/perforce/integrator/CMakeLists.txt
index 95985418..e939e3ba 100644
--- a/vcs/perforce/integrator/CMakeLists.txt
+++ b/vcs/perforce/integrator/CMakeLists.txt
@@ -26,7 +26,7 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevperforceintegrator.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevperforceintegrator.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
 ##### libperforceintegrator (module) ############
@@ -35,6 +35,6 @@ tde_add_kpart( libperforceintegrator AUTOMOC
   SOURCES
     perforceintegrator.cpp pfintegratordlgbase.ui
     pfintegratordlg.cpp
-  LINK tdevextras-shared tdevelop-shared
+  LINK kdevextras-shared tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/vcs/perforce/integrator/Makefile.am b/vcs/perforce/integrator/Makefile.am
index e400e241..38e80bcd 100644
--- a/vcs/perforce/integrator/Makefile.am
+++ b/vcs/perforce/integrator/Makefile.am
@@ -5,9 +5,9 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES = libperforceintegrator.la
 libperforceintegrator_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries)
 libperforceintegrator_la_LIBADD =\
-	$(top_builddir)/lib/interfaces/extras/libtdevextras.la\
+	$(top_builddir)/lib/interfaces/extras/libkdevextras.la\
 	$(top_builddir)/lib/libtdevelop.la
-kde_services_DATA = tdevperforceintegrator.desktop
+kde_services_DATA = kdevperforceintegrator.desktop
 noinst_HEADERS = perforceintegrator.h pfintegratordlg.h
 libperforceintegrator_la_SOURCES = perforceintegrator.cpp \
 	pfintegratordlgbase.ui pfintegratordlg.cpp
diff --git a/vcs/perforce/integrator/tdevperforceintegrator.desktop b/vcs/perforce/integrator/kdevperforceintegrator.desktop
index 78ad9bf2..78ad9bf2 100644
--- a/vcs/perforce/integrator/tdevperforceintegrator.desktop
+++ b/vcs/perforce/integrator/kdevperforceintegrator.desktop
diff --git a/vcs/perforce/integrator/perforceintegrator.cpp b/vcs/perforce/integrator/perforceintegrator.cpp
index 74fdf54f..bc7c0988 100644
--- a/vcs/perforce/integrator/perforceintegrator.cpp
+++ b/vcs/perforce/integrator/perforceintegrator.cpp
@@ -19,19 +19,19 @@
  ***************************************************************************/
 #include "perforceintegrator.h"
 
-#include <tdevgenericfactory.h>
-#include <tdevplugininfo.h>
+#include <kdevgenericfactory.h>
+#include <kdevplugininfo.h>
 
 #include "pfintegratordlg.h"
 
-static const TDevPluginInfo data("tdevperforceintegrator");
-typedef TDevGenericFactory<PerforceIntegrator> PerforceIntegratorFactory;
+static const KDevPluginInfo data("kdevperforceintegrator");
+typedef KDevGenericFactory<PerforceIntegrator> PerforceIntegratorFactory;
 K_EXPORT_COMPONENT_FACTORY( libperforceintegrator, PerforceIntegratorFactory(data) )
 
 PerforceIntegrator::PerforceIntegrator(TQObject* parent, const char* name,
     const TQStringList // args
                                        )
-    :TDevVCSIntegrator(parent, name)
+    :KDevVCSIntegrator(parent, name)
 {
 }
 
diff --git a/vcs/perforce/integrator/perforceintegrator.h b/vcs/perforce/integrator/perforceintegrator.h
index c97ff82f..2b82046f 100644
--- a/vcs/perforce/integrator/perforceintegrator.h
+++ b/vcs/perforce/integrator/perforceintegrator.h
@@ -20,11 +20,11 @@
 #ifndef PERFORCEINTEGRATOR_H
 #define PERFORCEINTEGRATOR_H
 
-#include <tdevvcsintegrator.h>
+#include <kdevvcsintegrator.h>
 
 #include <tqstringlist.h>
 
-class PerforceIntegrator : public TDevVCSIntegrator
+class PerforceIntegrator : public KDevVCSIntegrator
 {
 Q_OBJECT
   
diff --git a/vcs/perforce/integrator/pfintegratordlg.h b/vcs/perforce/integrator/pfintegratordlg.h
index 5398475b..3e7bf4de 100644
--- a/vcs/perforce/integrator/pfintegratordlg.h
+++ b/vcs/perforce/integrator/pfintegratordlg.h
@@ -21,7 +21,7 @@
 #define PFINTEGRATORDLG_H
 
 #include "pfintegratordlgbase.h"
-#include <tdevvcsintegrator.h>
+#include <kdevvcsintegrator.h>
 
 class PFIntegratorDlg: public PFIntegratorDlgBase, public VCSDialog {
 Q_OBJECT
diff --git a/vcs/perforce/tdevperforce.desktop b/vcs/perforce/kdevperforce.desktop
index 4f73f5e9..d837faeb 100644
--- a/vcs/perforce/tdevperforce.desktop
+++ b/vcs/perforce/kdevperforce.desktop
@@ -77,6 +77,6 @@ GenericName[tr]=Perforce Bütünleştirmesi
 GenericName[zh_CN]=Perforce 集成
 GenericName[zh_TW]=Perforce 整合
 ServiceTypes=TDevelop/VersionControl
-X-TDE-Library=libtdevperforce
+X-TDE-Library=libkdevperforce
 X-TDevelop-Version=5
 X-TDevelop-Properties=VCS,PerforceVCS
diff --git a/vcs/perforce/tdevperforcepart.rc b/vcs/perforce/kdevperforcepart.rc
index 27b5fe08..27b5fe08 100644
--- a/vcs/perforce/tdevperforcepart.rc
+++ b/vcs/perforce/kdevperforcepart.rc
diff --git a/vcs/perforce/perforcepart.cpp b/vcs/perforce/perforcepart.cpp
index 72672b1e..f92666b6 100644
--- a/vcs/perforce/perforcepart.cpp
+++ b/vcs/perforce/perforcepart.cpp
@@ -17,7 +17,7 @@
 #include <tqregexp.h>
 #include <tdepopupmenu.h>
 #include <kdebug.h>
-#include <tdevgenericfactory.h>
+#include <kdevgenericfactory.h>
 #include <kprocess.h>
 #include <tdemessagebox.h>
 #include <tdeapplication.h>
@@ -25,21 +25,21 @@
 #include <kurl.h>
 #include <tdeparts/part.h>
 
-#include "tdevpartcontroller.h"
-#include "tdevcore.h"
-#include "tdevmakefrontend.h"
-#include "tdevdifffrontend.h"
-#include "tdevplugininfo.h"
+#include "kdevpartcontroller.h"
+#include "kdevcore.h"
+#include "kdevmakefrontend.h"
+#include "kdevdifffrontend.h"
+#include "kdevplugininfo.h"
 #include "commitdlg.h"
 #include "execcommand.h"
 
-static const TDevPluginInfo data("tdevperforce");
+static const KDevPluginInfo data("kdevperforce");
 
-typedef TDevGenericFactory<PerforcePart> PerforceFactory;
-K_EXPORT_COMPONENT_FACTORY( libtdevperforce, PerforceFactory( data ) )
+typedef KDevGenericFactory<PerforcePart> PerforceFactory;
+K_EXPORT_COMPONENT_FACTORY( libkdevperforce, PerforceFactory( data ) )
 
 PerforcePart::PerforcePart( TQObject *parent, const char *name, const TQStringList & )
-    : TDevVersionControl( &data, parent, name ? name : "PerforcePart" )
+    : KDevVersionControl( &data, parent, name ? name : "PerforcePart" )
 {
     setInstance(PerforceFactory::instance());
     setupActions();
@@ -140,7 +140,7 @@ void PerforcePart::execCommand( const TQString& cmd, const TQString& filename )
     command += " && p4 " + cmd + " ";
     command += name;
 
-    if (TDevMakeFrontend *makeFrontend = extension<TDevMakeFrontend>("TDevelop/MakeFrontend"))
+    if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
         makeFrontend->queueCommand(dir, command);
 }
 
@@ -183,7 +183,7 @@ void PerforcePart::commit( const TQString& filename )
     TQString command("echo " + message);
     command += " | p4 submit -i";
 
-    if (TDevMakeFrontend *makeFrontend = extension<TDevMakeFrontend>("TDevelop/MakeFrontend"))
+    if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
         makeFrontend->queueCommand("", command);
 }
 
@@ -208,7 +208,7 @@ void PerforcePart::update( const TQString& filename )
     command += " && p4 sync ";
     command += name;
 
-    if (TDevMakeFrontend *makeFrontend = extension<TDevMakeFrontend>("TDevelop/MakeFrontend"))
+    if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
         makeFrontend->queueCommand(dir, command);
 }
 
@@ -277,7 +277,7 @@ void PerforcePart::slotDiffFinished( const TQString& diff, const TQString& err )
     TQString strippedDiff = diff;
     strippedDiff.replace( rx, "--- \\2\n+++ \\2\n" );
 
-    if (TDevDiffFrontend *diffFrontend = extension<TDevDiffFrontend>("TDevelop/DiffFrontend"))
+    if (KDevDiffFrontend *diffFrontend = extension<KDevDiffFrontend>("TDevelop/DiffFrontend"))
         diffFrontend->showDiff( strippedDiff );
 }
 
diff --git a/vcs/perforce/perforcepart.h b/vcs/perforce/perforcepart.h
index 2af8ff5f..7c034424 100644
--- a/vcs/perforce/perforcepart.h
+++ b/vcs/perforce/perforcepart.h
@@ -13,14 +13,14 @@
 #ifndef _PERFORCEPART_H_
 #define _PERFORCEPART_H_
 
-#include <tdevversioncontrol.h>
+#include <kdevversioncontrol.h>
 #include <tdelocale.h>
 
 class Context;
 class TQPopupMenu;
 class TDEAction;
 
-class PerforcePart : public TDevVersionControl
+class PerforcePart : public KDevVersionControl
 {
     Q_OBJECT
   
@@ -34,7 +34,7 @@ public:
 
     virtual void createNewProject(const TQString& /* dir */) {}
     virtual bool fetchFromRepository() { return true; }
-    virtual TDevVCSFileInfoProvider *fileInfoProvider() const { return 0; }
+    virtual KDevVCSFileInfoProvider *fileInfoProvider() const { return 0; }
     virtual bool isValidDirectory(const TQString& /* dirPath*/) const
     { return true; }
 
diff --git a/vcs/subversion/CMakeLists.txt b/vcs/subversion/CMakeLists.txt
index 63ffad4b..fb51fe3d 100644
--- a/vcs/subversion/CMakeLists.txt
+++ b/vcs/subversion/CMakeLists.txt
@@ -31,19 +31,19 @@ link_directories(
 ##### other data ################################
 
 install( FILES
-    tdevsubversion.desktop tdevsvn+file.protocol
-    tdevsvn+http.protocol tdevsvn+https.protocol
-    tdevsvn+ssh.protocol tdevsvn+svn.protocol
+    kdevsubversion.desktop kdevsvn+file.protocol
+    kdevsvn+http.protocol kdevsvn+https.protocol
+    kdevsvn+ssh.protocol kdevsvn+svn.protocol
   DESTINATION ${SERVICES_INSTALL_DIR} )
 
 install( FILES
-    tdevsvnd.desktop
+    kdevsvnd.desktop
   DESTINATION ${SERVICES_INSTALL_DIR}/kded )
 
 
-##### libtdevsubversion (module) ################
+##### libkdevsubversion (module) ################
 
-tde_add_kpart( libtdevsubversion AUTOMOC
+tde_add_kpart( libkdevsubversion AUTOMOC
   SOURCES
     subversion_core.cpp subversion_fileinfo.cpp
     subversion_fileinfo.skel subversion_part.cpp
@@ -54,14 +54,14 @@ tde_add_kpart( libtdevsubversion AUTOMOC
     svn_logviewoptiondlgbase.ui svn_logviewwidget.cpp
     svn_mergeoptiondlgbase.ui svn_mergewidget.cpp
     svn_switchdlgbase.ui svn_switchwidget.cpp
-  LINK tdevextensions-static tdevelop-shared
+  LINK kdevextensions-static tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
 
-##### tdeio_tdevsvn (module) ######################
+##### tdeio_kdevsvn (module) ######################
 
-tde_add_kpart( tdeio_tdevsvn AUTOMOC
+tde_add_kpart( tdeio_kdevsvn AUTOMOC
   SOURCES
     svn_tdeio.cpp
   LINK tdeio-shared ${SVN_LIBRARIES} ${APR_LIBRARIES}
@@ -69,12 +69,12 @@ tde_add_kpart( tdeio_tdevsvn AUTOMOC
 )
 
 
-##### kded_tdevsvnd (module) ####################
+##### kded_kdevsvnd (module) ####################
 
-tde_add_kpart( kded_tdevsvnd AUTOMOC
+tde_add_kpart( kded_kdevsvnd AUTOMOC
   SOURCES
-    commitdlg.cpp commitdlgbase.ui tdevsvnd.cpp tdevsvnd.skel
-    tdevsvnd_widgets.cpp svnssltrustpromptbase.ui
+    commitdlg.cpp commitdlgbase.ui kdevsvnd.cpp kdevsvnd.skel
+    kdevsvnd_widgets.cpp svnssltrustpromptbase.ui
   LINK tdeio-shared tdeinit_kded-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/vcs/subversion/Makefile.am b/vcs/subversion/Makefile.am
index 2f650195..a66b80dd 100644
--- a/vcs/subversion/Makefile.am
+++ b/vcs/subversion/Makefile.am
@@ -2,37 +2,37 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util -I$(top_srcdi
 
 METASOURCES = AUTO
 
-kde_module_LTLIBRARIES = libtdevsubversion.la tdeio_tdevsvn.la kded_tdevsvnd.la
+kde_module_LTLIBRARIES = libkdevsubversion.la tdeio_kdevsvn.la kded_kdevsvnd.la
 
-libtdevsubversion_la_SOURCES = subversion_core.cpp subversion_fileinfo.cpp \
+libkdevsubversion_la_SOURCES = subversion_core.cpp subversion_fileinfo.cpp \
 	subversion_fileinfo.skel subversion_part.cpp subversion_widget.cpp subversiondiff.ui \
 	subversionprojectwidget.ui svn_blamewidget.cpp svn_co.ui svn_commitdlgbase.ui svn_copydlgwidget.ui \
 	svn_copywidget.cpp svn_fileselectdlg_commit.cpp svn_logviewoptiondlgbase.ui \
 	svn_logviewwidget.cpp svn_mergeoptiondlgbase.ui svn_mergewidget.cpp svn_switchdlgbase.ui \
 	svn_switchwidget.cpp
-libtdevsubversion_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/interfaces/extensions/libtdevextensions.la
-libtdevsubversion_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevsubversion_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la
+libkdevsubversion_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
 
 	
-tdeio_tdevsvn_la_SOURCES = svn_tdeio.cpp
-tdeio_tdevsvn_la_LIBADD = $(LIB_TDEIO)
-tdeio_tdevsvn_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) $(SVN_LIB)
+tdeio_kdevsvn_la_SOURCES = svn_tdeio.cpp
+tdeio_kdevsvn_la_LIBADD = $(LIB_TDEIO)
+tdeio_kdevsvn_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) $(SVN_LIB)
 
-kded_tdevsvnd_la_SOURCES = commitdlg.cpp commitdlgbase.ui tdevsvnd.cpp \
-	tdevsvnd.skel tdevsvnd_widgets.cpp svnssltrustpromptbase.ui
-kded_tdevsvnd_la_LIBADD = $(LIB_TDEIO) -ltdeinit_kded
-kded_tdevsvnd_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
+kded_kdevsvnd_la_SOURCES = commitdlg.cpp commitdlgbase.ui kdevsvnd.cpp \
+	kdevsvnd.skel kdevsvnd_widgets.cpp svnssltrustpromptbase.ui
+kded_kdevsvnd_la_LIBADD = $(LIB_TDEIO) -ltdeinit_kded
+kded_kdevsvnd_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
 
 kdeddir = $(kde_servicesdir)/kded
-kded_DATA = tdevsvnd.desktop
+kded_DATA = kdevsvnd.desktop
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevsubversion.desktop
+service_DATA = kdevsubversion.desktop
 
 protocoldir = $(kde_servicesdir)
-protocol_DATA = tdevsvn+file.protocol tdevsvn+http.protocol tdevsvn+https.protocol tdevsvn+ssh.protocol tdevsvn+svn.protocol
+protocol_DATA = kdevsvn+file.protocol kdevsvn+http.protocol kdevsvn+https.protocol kdevsvn+ssh.protocol kdevsvn+svn.protocol
 
 
 SUBDIRS = integrator
-noinst_HEADERS = commitdlg.h tdevsvnd.h svn_blamewidget.h svn_copywidget.h \
+noinst_HEADERS = commitdlg.h kdevsvnd.h svn_blamewidget.h svn_copywidget.h \
 	svn_fileselectdlg_commit.h svn_logviewwidget.h svn_mergewidget.h svn_switchwidget.h
diff --git a/vcs/subversion/integrator/CMakeLists.txt b/vcs/subversion/integrator/CMakeLists.txt
index 3d6c7ad3..2256b8e3 100644
--- a/vcs/subversion/integrator/CMakeLists.txt
+++ b/vcs/subversion/integrator/CMakeLists.txt
@@ -26,7 +26,7 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevsubversionintegrator.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevsubversionintegrator.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
 ##### libsubversionintegrator (module) ##########
@@ -35,6 +35,6 @@ tde_add_kpart( libsubversionintegrator AUTOMOC
   SOURCES
     subversionintegrator.cpp svnintegratordlgbase.ui
     svnintegratordlg.cpp
-  LINK tdevextras-shared tdevelop-shared
+  LINK kdevextras-shared tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/vcs/subversion/integrator/Makefile.am b/vcs/subversion/integrator/Makefile.am
index aded8465..231dc3c7 100644
--- a/vcs/subversion/integrator/Makefile.am
+++ b/vcs/subversion/integrator/Makefile.am
@@ -6,9 +6,9 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES = libsubversionintegrator.la
 libsubversionintegrator_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries)
 libsubversionintegrator_la_LIBADD =\
-	$(top_builddir)/lib/interfaces/extras/libtdevextras.la\
+	$(top_builddir)/lib/interfaces/extras/libkdevextras.la\
 	$(top_builddir)/lib/libtdevelop.la
-kde_services_DATA = tdevsubversionintegrator.desktop
+kde_services_DATA = kdevsubversionintegrator.desktop
 noinst_HEADERS = subversionintegrator.h svnintegratordlg.h
 libsubversionintegrator_la_SOURCES = subversionintegrator.cpp \
 	svnintegratordlgbase.ui svnintegratordlg.cpp
diff --git a/vcs/subversion/integrator/tdevsubversionintegrator.desktop b/vcs/subversion/integrator/kdevsubversionintegrator.desktop
index 6e666667..6e666667 100644
--- a/vcs/subversion/integrator/tdevsubversionintegrator.desktop
+++ b/vcs/subversion/integrator/kdevsubversionintegrator.desktop
diff --git a/vcs/subversion/integrator/subversionintegrator.cpp b/vcs/subversion/integrator/subversionintegrator.cpp
index da8fed8c..32d28d27 100644
--- a/vcs/subversion/integrator/subversionintegrator.cpp
+++ b/vcs/subversion/integrator/subversionintegrator.cpp
@@ -19,19 +19,19 @@
  ***************************************************************************/
 #include "subversionintegrator.h"
 
-#include <tdevgenericfactory.h>
-#include <tdevplugininfo.h>
+#include <kdevgenericfactory.h>
+#include <kdevplugininfo.h>
 
 #include "svnintegratordlg.h"
 
-static const TDevPluginInfo data("tdevsubversionintegrator");
-typedef TDevGenericFactory<SubversionIntegrator> SubversionIntegratorFactory;
+static const KDevPluginInfo data("kdevsubversionintegrator");
+typedef KDevGenericFactory<SubversionIntegrator> SubversionIntegratorFactory;
 K_EXPORT_COMPONENT_FACTORY( libsubversionintegrator, SubversionIntegratorFactory(data) )
 
 SubversionIntegrator::SubversionIntegrator(TQObject* parent, const char* name,
     const TQStringList // args
                                            )
-    :TDevVCSIntegrator(parent, name)
+    :KDevVCSIntegrator(parent, name)
 {
 }
 
diff --git a/vcs/subversion/integrator/subversionintegrator.h b/vcs/subversion/integrator/subversionintegrator.h
index 6c7d16ac..01c43516 100644
--- a/vcs/subversion/integrator/subversionintegrator.h
+++ b/vcs/subversion/integrator/subversionintegrator.h
@@ -20,11 +20,11 @@
 #ifndef SUBVERSIONINTEGRATOR_H
 #define SUBVERSIONINTEGRATOR_H
 
-#include <tdevvcsintegrator.h>
+#include <kdevvcsintegrator.h>
 
 #include <tqstringlist.h>
 
-class SubversionIntegrator : public TDevVCSIntegrator
+class SubversionIntegrator : public KDevVCSIntegrator
 {
 Q_OBJECT
   
diff --git a/vcs/subversion/integrator/svnintegratordlg.cpp b/vcs/subversion/integrator/svnintegratordlg.cpp
index 35e4216b..87ccf488 100644
--- a/vcs/subversion/integrator/svnintegratordlg.cpp
+++ b/vcs/subversion/integrator/svnintegratordlg.cpp
@@ -47,7 +47,7 @@ SvnIntegratorDlg::SvnIntegratorDlg( TQWidget *parent, const char *name )
 void SvnIntegratorDlg::accept()
 {
     // to let ioslave know which protocol it should start.
-    KURL protocolUrl = KURL("tdevsvn+svn://blah/");
+    KURL protocolUrl = KURL("kdevsvn+svn://blah/");
     KURL servURL( repos1->url() );
     if ( servURL.isEmpty() ) return;
     
diff --git a/vcs/subversion/integrator/svnintegratordlg.h b/vcs/subversion/integrator/svnintegratordlg.h
index bc8e8407..ccf1686f 100644
--- a/vcs/subversion/integrator/svnintegratordlg.h
+++ b/vcs/subversion/integrator/svnintegratordlg.h
@@ -21,7 +21,7 @@
 #define SVNINTEGRATORDLG_H
 
 #include "svnintegratordlgbase.h"
-#include <tdevvcsintegrator.h>
+#include <kdevvcsintegrator.h>
 
 class SvnIntegratorDlg: public SvnIntegratorDlgBase, public VCSDialog {
 Q_OBJECT
diff --git a/vcs/subversion/tdevpart_subversion.rc b/vcs/subversion/kdevpart_subversion.rc
index ad957e99..ad957e99 100644
--- a/vcs/subversion/tdevpart_subversion.rc
+++ b/vcs/subversion/kdevpart_subversion.rc
diff --git a/vcs/subversion/tdevsubversion.desktop b/vcs/subversion/kdevsubversion.desktop
index 7643c755..bf52db8c 100644
--- a/vcs/subversion/tdevsubversion.desktop
+++ b/vcs/subversion/kdevsubversion.desktop
@@ -29,6 +29,6 @@ GenericName[ta]=துணை பதிப்பு
 GenericName[tg]=Зер-ривоят
 Icon=misc
 ServiceTypes=TDevelop/VersionControl
-X-TDE-Library=libtdevsubversion
+X-TDE-Library=libkdevsubversion
 X-TDevelop-Version=5
 X-TDevelop-Properties=VCS,SubversionVCS
diff --git a/vcs/subversion/tdevsvn+file.protocol b/vcs/subversion/kdevsvn+file.protocol
index 412c3800..412c3800 100644
--- a/vcs/subversion/tdevsvn+file.protocol
+++ b/vcs/subversion/kdevsvn+file.protocol
diff --git a/vcs/subversion/tdevsvn+http.protocol b/vcs/subversion/kdevsvn+http.protocol
index 5a063b85..5a063b85 100644
--- a/vcs/subversion/tdevsvn+http.protocol
+++ b/vcs/subversion/kdevsvn+http.protocol
diff --git a/vcs/subversion/tdevsvn+https.protocol b/vcs/subversion/kdevsvn+https.protocol
index d064e575..d064e575 100644
--- a/vcs/subversion/tdevsvn+https.protocol
+++ b/vcs/subversion/kdevsvn+https.protocol
diff --git a/vcs/subversion/tdevsvn+ssh.protocol b/vcs/subversion/kdevsvn+ssh.protocol
index 512b4a90..512b4a90 100644
--- a/vcs/subversion/tdevsvn+ssh.protocol
+++ b/vcs/subversion/kdevsvn+ssh.protocol
diff --git a/vcs/subversion/tdevsvn+svn.protocol b/vcs/subversion/kdevsvn+svn.protocol
index 8f496854..8f496854 100644
--- a/vcs/subversion/tdevsvn+svn.protocol
+++ b/vcs/subversion/kdevsvn+svn.protocol
diff --git a/vcs/subversion/tdevsvnd.cpp b/vcs/subversion/kdevsvnd.cpp
index ea42667b..c1faf65e 100644
--- a/vcs/subversion/tdevsvnd.cpp
+++ b/vcs/subversion/kdevsvnd.cpp
@@ -30,24 +30,24 @@
 
 #include "config.h"
 
-#include "tdevsvnd.h"
+#include "kdevsvnd.h"
 
-#include "tdevsvnd_widgets.h"
+#include "kdevsvnd_widgets.h"
 #include "commitdlg.h"
 
 extern "C" {
     KDE_EXPORT KDEDModule *create_kdevsvnd(const TQCString &name) {
-       return new TDevSvnd(name);
+       return new KDevSvnd(name);
     }
 }
 
-TDevSvnd::TDevSvnd(const TQCString &name)
+KDevSvnd::KDevSvnd(const TQCString &name)
  : KDEDModule(name) {
 }
-TDevSvnd::~TDevSvnd()
+KDevSvnd::~KDevSvnd()
 {}
 
-TQString TDevSvnd::commitDialog(TQString modifiedFiles) {
+TQString KDevSvnd::commitDialog(TQString modifiedFiles) {
 	CommitDlg commitDlg;
 	commitDlg.setCaption(i18n("Enter Commit Log Message:"));
 	commitDlg.listMessage->setText( modifiedFiles );
@@ -57,7 +57,7 @@ TQString TDevSvnd::commitDialog(TQString modifiedFiles) {
 	} else
 		return TQString();
 }
-int TDevSvnd::sslServerTrustPrompt( TQString errmsg, TQString hostname, TQString fingerPrint, TQString validfrom, TQString validuntil, TQString issuerName, TQString ascii_cert )
+int KDevSvnd::sslServerTrustPrompt( TQString errmsg, TQString hostname, TQString fingerPrint, TQString validfrom, TQString validuntil, TQString issuerName, TQString ascii_cert )
 {
 	SvnSSLTrustPrompt dlg;
 	dlg.setupCertInfo( hostname, fingerPrint, validfrom, validuntil, issuerName, ascii_cert );
@@ -69,12 +69,12 @@ int TDevSvnd::sslServerTrustPrompt( TQString errmsg, TQString hostname, TQString
 		return -1;
 	}
 }
-TQString TDevSvnd::sslCertFile()
+TQString KDevSvnd::sslCertFile()
 {
 	TQString fileName = KFileDialog::getOpenFileName(TQString(),TQString(),0, i18n("Open SSL certificate file"));
 	return fileName;
 }
-TQCString TDevSvnd::sslPasswdDlg(TQString promptMsg)
+TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg)
 {
 	TQCString passwd;
 	int ret = KPasswordDialog::getPassword( passwd,promptMsg );
@@ -90,7 +90,7 @@ TQCString TDevSvnd::sslPasswdDlg(TQString promptMsg)
 }
 
 
-// void TDevSvnd::registerMe(const TQCString &app)
+// void KDevSvnd::registerMe(const TQCString &app)
 // {
 // 	insert(app, "test", new TestObject(app));
 //    // When 'app' unregisters with DCOP, the TestObject will get deleted.
@@ -391,4 +391,4 @@ TQCString TDevSvnd::sslPasswdDlg(TQString promptMsg)
 // }
 // #endif
 
-#include "tdevsvnd.moc"
+#include "kdevsvnd.moc"
diff --git a/vcs/subversion/tdevsvnd.desktop b/vcs/subversion/kdevsvnd.desktop
index 9ba3e877..9ba3e877 100644
--- a/vcs/subversion/tdevsvnd.desktop
+++ b/vcs/subversion/kdevsvnd.desktop
diff --git a/vcs/subversion/tdevsvnd.h b/vcs/subversion/kdevsvnd.h
index 4bec5ae7..438520e1 100644
--- a/vcs/subversion/tdevsvnd.h
+++ b/vcs/subversion/kdevsvnd.h
@@ -26,7 +26,7 @@
 #include <kurl.h>
 #include <tqstringlist.h>
 
-class TDevSvnd : public KDEDModule
+class KDevSvnd : public KDEDModule
 {
 Q_OBJECT
 //
@@ -36,8 +36,8 @@ K_DCOP
   //note: InSVN means parent is added.  InRepos  means itself is added
 	enum { SomeAreFiles = 1, SomeAreFolders = 2,  SomeAreInParentsEntries = 4, SomeParentsHaveSvn = 8, SomeHaveSvn = 16, SomeAreExternalToParent = 32, AllAreInParentsEntries = 64, AllParentsHaveSvn = 128, AllHaveSvn = 256, AllAreExternalToParent = 512, AllAreFolders = 1024 };
 public:
-	TDevSvnd(const TQCString &);
-	~TDevSvnd();
+	KDevSvnd(const TQCString &);
+	~KDevSvnd();
 
 k_dcop:
 //  void addAuthInfo(TDEIO::AuthInfo, long);
diff --git a/vcs/subversion/tdevsvnd_widgets.cpp b/vcs/subversion/kdevsvnd_widgets.cpp
index ba688423..0fd2c20b 100644
--- a/vcs/subversion/tdevsvnd_widgets.cpp
+++ b/vcs/subversion/kdevsvnd_widgets.cpp
@@ -12,7 +12,7 @@
  *  Library General Public License for more details.
  */
  
-#include "tdevsvnd_widgets.h"
+#include "kdevsvnd_widgets.h"
 #include <tqpushbutton.h>
 #include <tqlistview.h>
 #include <tqlabel.h>
@@ -67,4 +67,4 @@ void SvnSSLTrustPrompt::setRejected()
 {
 	m_code = -1;
 }
-#include "tdevsvnd_widgets.moc"
+#include "kdevsvnd_widgets.moc"
diff --git a/vcs/subversion/tdevsvnd_widgets.h b/vcs/subversion/kdevsvnd_widgets.h
index da7942b2..3967cb35 100644
--- a/vcs/subversion/tdevsvnd_widgets.h
+++ b/vcs/subversion/kdevsvnd_widgets.h
@@ -12,8 +12,8 @@
  *  Library General Public License for more details.
  */
 
-#ifndef TDEVSVND_WIDGETS_H
-#define TDEVSVND_WIDGETS_H
+#ifndef KDEVSVND_WIDGETS_H
+#define KDEVSVND_WIDGETS_H
 
 #include "svnssltrustpromptbase.h"
 
diff --git a/vcs/subversion/subversion_core.cpp b/vcs/subversion/subversion_core.cpp
index 108bf298..e9c89ece 100644
--- a/vcs/subversion/subversion_core.cpp
+++ b/vcs/subversion/subversion_core.cpp
@@ -18,15 +18,15 @@
 	 */
 
 #include <tdeparts/part.h>
-#include <tdevcore.h>
-#include <tdevproject.h>
+#include <kdevcore.h>
+#include <kdevproject.h>
 #include "subversion_part.h"
 #include "subversion_core.h"
 #include "subversion_widget.h"
 #include "svn_blamewidget.h"
 #include "svn_logviewwidget.h"
 #include "subversiondiff.h"
-#include <tdevmainwindow.h>
+#include <kdevmainwindow.h>
 #include "svn_co.h"
 #include <kurlrequester.h>
 #include <klineedit.h>
@@ -82,7 +82,7 @@ subversionCore::~subversionCore() {
 	//FIXME delete m_fileInfoProvider here?
 }
 
-TDevVCSFileInfoProvider *subversionCore::fileInfoProvider() const {
+KDevVCSFileInfoProvider *subversionCore::fileInfoProvider() const {
     return m_fileInfoProvider;
 }
 
@@ -114,8 +114,8 @@ subversionWidget *subversionCore::processWidget() const {
 void subversionCore::resolve( const KURL::List& list ) {
 	KURL servURL = m_part->baseURL();
 	if ( servURL.isEmpty() ) servURL="kdevsvn+svn://blah/";
-	if ( ! servURL.protocol().startsWith( "tdevsvn+" ) ) {
-		servURL.setProtocol( "tdevsvn+" + servURL.protocol() ); //make sure it starts with "svn"
+	if ( ! servURL.protocol().startsWith( "kdevsvn+" ) ) {
+		servURL.setProtocol( "kdevsvn+" + servURL.protocol() ); //make sure it starts with "svn"
 	}
 	kdDebug(9036) << "servURL : " << servURL.prettyURL() << endl;
 	for ( TQValueListConstIterator<KURL> it = list.begin(); it != list.end() ; ++it ) {
@@ -248,8 +248,8 @@ void subversionCore::diffAsync( const KURL &pathOrUrl1, const KURL &pathOrUrl2,
 void subversionCore::commit( const KURL::List& list, bool recurse, bool keeplocks ) {
 	KURL servURL = m_part->baseURL();
 	if ( servURL.isEmpty() ) servURL="kdevsvn+svn://blah/";
-	if ( ! servURL.protocol().startsWith( "tdevsvn+" ) ) {
-		servURL.setProtocol( "tdevsvn+" + servURL.protocol() ); //make sure it starts with "svn"
+	if ( ! servURL.protocol().startsWith( "kdevsvn+" ) ) {
+		servURL.setProtocol( "kdevsvn+" + servURL.protocol() ); //make sure it starts with "svn"
 	}
 	kdDebug(9036) << "servURL : " << servURL.prettyURL() << endl;
 	TQByteArray parms;
@@ -277,8 +277,8 @@ void subversionCore::svnLog( const KURL::List& list,
         clientInfo( KURL(m_part->project()->projectDirectory()), false, m_part->m_prjInfoMap );
 	KURL servURL = m_part->baseURL();
 	if ( servURL.isEmpty() ) servURL="kdevsvn+svn://blah/";
-	if ( ! servURL.protocol().startsWith( "tdevsvn+" ) ) {
-		servURL.setProtocol( "tdevsvn+" + servURL.protocol() ); //make sure it starts with "svn"
+	if ( ! servURL.protocol().startsWith( "kdevsvn+" ) ) {
+		servURL.setProtocol( "kdevsvn+" + servURL.protocol() ); //make sure it starts with "svn"
 	}
 	kdDebug(9036) << "servURL : " << servURL.prettyURL() << endl;
 	TQByteArray parms;
@@ -304,8 +304,8 @@ void subversionCore::blame( const KURL &url, UrlMode mode, int revstart, TQStrin
 {
 	KURL servURL = m_part->baseURL();
 	if ( servURL.isEmpty() ) servURL="kdevsvn+svn://blah/";
-	if ( ! servURL.protocol().startsWith( "tdevsvn+" ) ) {
-		servURL.setProtocol( "tdevsvn+" + servURL.protocol() ); //make sure it starts with "svn"
+	if ( ! servURL.protocol().startsWith( "kdevsvn+" ) ) {
+		servURL.setProtocol( "kdevsvn+" + servURL.protocol() ); //make sure it starts with "svn"
 	}
 	kdDebug(9036) << "servURL : " << servURL.prettyURL() << endl;
 	TQByteArray parms;
@@ -374,7 +374,7 @@ void subversionCore::checkout() {
 		int cmd = 1;
 		int rev = -1;
 		s << cmd << servURL << KURL( wcPath ) << rev << TQString( "HEAD" );
-		servURL.setProtocol( "tdevsvn+" + servURL.protocol() ); //make sure it starts with "svn"
+		servURL.setProtocol( "kdevsvn+" + servURL.protocol() ); //make sure it starts with "svn"
 		SimpleJob * job = TDEIO::special(servURL,parms, true);
 		job->setWindow( m_part->mainWindow()->main() );
 		connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotEndCheckout( TDEIO::Job * ) ) );
diff --git a/vcs/subversion/subversion_core.h b/vcs/subversion/subversion_core.h
index 60cd8cfc..f2f3f6da 100644
--- a/vcs/subversion/subversion_core.h
+++ b/vcs/subversion/subversion_core.h
@@ -29,7 +29,7 @@
 #include "subversion_fileinfo.h"
 #include "subversion_global.h"
 
-class TDevProject;
+class KDevProject;
 class subversionPart;
 class subversionWidget;
 class TDEApplication;
@@ -76,7 +76,7 @@ public:
     // Return true on success. Otherwise return false.
     bool clientInfo( KURL path_or_url, bool recurse, TQMap< KURL, SvnGlobal::SvnInfoHolder> &holderMap );
 	void createNewProject( const TQString& dirName, const KURL& importURL, bool init );
-    TDevVCSFileInfoProvider *fileInfoProvider() const;
+    KDevVCSFileInfoProvider *fileInfoProvider() const;
 	
 	void initProcessDlg( TDEIO::Job *job, const TQString &src, const TQString &dest );
 // k_dcop:
diff --git a/vcs/subversion/subversion_fileinfo.cpp b/vcs/subversion/subversion_fileinfo.cpp
index c41ff9ef..45d44d1e 100644
--- a/vcs/subversion/subversion_fileinfo.cpp
+++ b/vcs/subversion/subversion_fileinfo.cpp
@@ -22,10 +22,10 @@
 #include <kdebug.h>
 #include <tqfileinfo.h>
 #include <tqdir.h>
-#include <tdevproject.h>
+#include <kdevproject.h>
 #include <unistd.h>
 #include <tdeapplication.h>
-#include <tdevmainwindow.h>
+#include <kdevmainwindow.h>
 #include <tdemainwindow.h>
 #include <tqregexp.h>
 
@@ -33,7 +33,7 @@
 #include <tdelocale.h>
 
 SVNFileInfoProvider::SVNFileInfoProvider(subversionPart *parent, const char *name)
-    : TDevVCSFileInfoProvider( parent, "svnfileinfoprovider" ),
+    : KDevVCSFileInfoProvider( parent, "svnfileinfoprovider" ),
 	m_cachedDirEntries( 0 ), m_recursiveDirEntries(0) {
 	Q_UNUSED(name);
 	m_part = parent;
diff --git a/vcs/subversion/subversion_fileinfo.h b/vcs/subversion/subversion_fileinfo.h
index 1d144270..9b322463 100644
--- a/vcs/subversion/subversion_fileinfo.h
+++ b/vcs/subversion/subversion_fileinfo.h
@@ -23,7 +23,7 @@
 
 #include <tqmap.h>
 
-#include <tdevversioncontrol.h>
+#include <kdevversioncontrol.h>
 #include <tdeio/job.h>
 #include <dcopclient.h>
 #include <dcopobject.h>
@@ -34,7 +34,7 @@ Provider for SVN file information
 
 @author Mickael Marchand
 */
-class SVNFileInfoProvider : public TDevVCSFileInfoProvider, public DCOPObject/*, virtual public DCOPClient*/
+class SVNFileInfoProvider : public KDevVCSFileInfoProvider, public DCOPObject/*, virtual public DCOPClient*/
 {
     Q_OBJECT
 //    
diff --git a/vcs/subversion/subversion_part.cpp b/vcs/subversion/subversion_part.cpp
index 3df326d9..f3f43cd9 100644
--- a/vcs/subversion/subversion_part.cpp
+++ b/vcs/subversion/subversion_part.cpp
@@ -21,18 +21,18 @@
 #include <tqwhatsthis.h>
 #include <kiconloader.h>
 #include <tdelocale.h>
-#include <tdevgenericfactory.h>
+#include <kdevgenericfactory.h>
 #include <tdeaction.h>
 #include <tdepopupmenu.h>
 
-#include "tdevcore.h"
-#include "tdevmainwindow.h"
+#include "kdevcore.h"
+#include "kdevmainwindow.h"
 #include "subversion_core.h"
 #include "subversion_widget.h"
 #include "subversionprojectwidget.h"
 #include "subversion_fileinfo.h"
 #include "subversion_global.h"
-#include "tdevversioncontrol.h"
+#include "kdevversioncontrol.h"
 #include "svn_fileselectdlg_commit.h"
 #include "svn_logviewwidget.h"
 #include "svn_switchwidget.h"
@@ -43,28 +43,28 @@
 #include <tqvbox.h>
 #include <kdialogbase.h>
 #include <tdeparts/part.h>
-#include <tdevpartcontroller.h>
-#include <tdevproject.h>
+#include <kdevpartcontroller.h>
+#include <kdevproject.h>
 #include <domutil.h>
 #include <kurlrequester.h>
 #include <tqradiobutton.h>
 #include <kdebug.h>
 #include <tqwidget.h>
-#include <tdevplugininfo.h>
+#include <kdevplugininfo.h>
 
 #include <tdemessagebox.h>
 
 using namespace SvnGlobal;
 
-static const TDevPluginInfo data("tdevsubversion");
+static const KDevPluginInfo data("kdevsubversion");
 
-typedef TDevGenericFactory<subversionPart> subversionFactory;
-K_EXPORT_COMPONENT_FACTORY( libtdevsubversion, subversionFactory( data ) )
+typedef KDevGenericFactory<subversionPart> subversionFactory;
+K_EXPORT_COMPONENT_FACTORY( libkdevsubversion, subversionFactory( data ) )
 
 //bool g_projectWasJustCreated = false;
 
 subversionPart::subversionPart(TQObject *parent, const char *name, const TQStringList& )
-	: TDevVersionControl(&data, parent, name ? name : "Subversion" ) {
+	: KDevVersionControl(&data, parent, name ? name : "Subversion" ) {
 	setInstance(subversionFactory::instance());
 	m_projWidget = 0;
 
@@ -79,7 +79,7 @@ subversionPart::subversionPart(TQObject *parent, const char *name, const TQStrin
 	// Context menu
 	connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) );
 	connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQT_SLOT(projectConfigWidget(KDialogBase*)) );
-	connect( core(), TQT_SIGNAL(stopButtonClicked(TDevPlugin*)), this, TQT_SLOT(slotStopButtonClicked(TDevPlugin*)) );
+	connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) );
 	connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) );
 	connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(slotProjectClosed()) );
 
@@ -177,7 +177,7 @@ bool subversionPart::fetchFromRepository() {
         return true;
 }
 
-TDevVCSFileInfoProvider * subversionPart::fileInfoProvider() const {
+KDevVCSFileInfoProvider * subversionPart::fileInfoProvider() const {
 	return m_impl->fileInfoProvider();
 }
 
diff --git a/vcs/subversion/subversion_part.h b/vcs/subversion/subversion_part.h
index 9296152a..1847567d 100644
--- a/vcs/subversion/subversion_part.h
+++ b/vcs/subversion/subversion_part.h
@@ -16,16 +16,16 @@
 	 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 	 Boston, MA 02110-1301, USA.
 	 */
-#ifndef __TDEVPART_SUBVERSION_H__
-#define __TDEVPART_SUBVERSION_H__
+#ifndef __KDEVPART_SUBVERSION_H__
+#define __KDEVPART_SUBVERSION_H__
 
 
 #include <tqguardedptr.h>
-#include <tdevplugin.h>
+#include <kdevplugin.h>
 #include <kurl.h>
 #include <tqpopupmenu.h>
 #include <kdialogbase.h>
-#include "tdevversioncontrol.h"
+#include "kdevversioncontrol.h"
 
 class subversionCore;
 class subversionOptionsWidget;
@@ -36,7 +36,7 @@ namespace SvnGlobal
 class SvnInfoHolder;
 };
 
-class subversionPart : public TDevVersionControl
+class subversionPart : public KDevVersionControl
 {
 	Q_OBJECT
   
@@ -49,7 +49,7 @@ public:
 		TQWidget* newProjectWidget( TQWidget* parent );
 		void createNewProject( const TQString& dirname );
 		bool fetchFromRepository();
-		TDevVCSFileInfoProvider * fileInfoProvider() const;
+		KDevVCSFileInfoProvider * fileInfoProvider() const;
 		bool urlFocusedDocument( KURL &url );
 		void restorePartialProjectSession(const TQDomElement* );
 		void savePartialProjectSession(TQDomElement* );
diff --git a/vcs/subversion/subversion_widget.cpp b/vcs/subversion/subversion_widget.cpp
index 9b29e1fa..95b31f6b 100644
--- a/vcs/subversion/subversion_widget.cpp
+++ b/vcs/subversion/subversion_widget.cpp
@@ -18,7 +18,7 @@
 	 */
 
 #include <tdeparts/part.h>
-#include <tdevcore.h>
+#include <kdevcore.h>
 #include <kdebug.h>
 #include <klineedit.h>
 
diff --git a/vcs/subversion/svn_fileselectdlg_commit.cpp b/vcs/subversion/svn_fileselectdlg_commit.cpp
index 9c210a37..e042df84 100644
--- a/vcs/subversion/svn_fileselectdlg_commit.cpp
+++ b/vcs/subversion/svn_fileselectdlg_commit.cpp
@@ -29,10 +29,10 @@
 #include <tqcheckbox.h>
 #include <kdebug.h>
 #include <tdemessagebox.h>
-#include "tdevmainwindow.h"
+#include "kdevmainwindow.h"
 #include <tdelocale.h>
 
-#include <tdevproject.h>
+#include <kdevproject.h>
 
 SVNFileSelectDlgCommit::SVNFileSelectDlgCommit( KURL::List &urls, subversionPart *part, TQWidget* parent)
 	:SvnCommitDlgBase( parent, "svnfileselectcommitdlg", true )
diff --git a/vcs/subversion/svn_logviewwidget.cpp b/vcs/subversion/svn_logviewwidget.cpp
index e872a586..10e55a9f 100644
--- a/vcs/subversion/svn_logviewwidget.cpp
+++ b/vcs/subversion/svn_logviewwidget.cpp
@@ -22,7 +22,7 @@
 #include "svn_blamewidget.h"
 #include "subversion_core.h"
 #include "subversion_global.h"
-#include <tdevproject.h>
+#include <kdevproject.h>
 #include <ktextedit.h>
 #include <tdemessagebox.h>
 #include <kdebug.h>
diff --git a/vcs/subversion/svn_tdeio.cpp b/vcs/subversion/svn_tdeio.cpp
index 0abac2b8..23f1d2ff 100644
--- a/vcs/subversion/svn_tdeio.cpp
+++ b/vcs/subversion/svn_tdeio.cpp
@@ -124,7 +124,7 @@ tdeio_svnProtocol::tdeio_svnProtocol(const TQCString &pool_socket, const TQCStri
 		apr_initialize();
                 // Make sure to properly initialize svn client, besides other things, this sets up
                 // NLS support for environments that don't use UTF-8
-                svn_cmdline_init("tdevsvnd",NULL);
+                svn_cmdline_init("kdevsvnd",NULL);
 		// CleanUP ctx preventing crash in svn_client_update and other
 		memset(&ctx, 0, sizeof(ctx));
 		pool = svn_pool_create (NULL);
@@ -1861,7 +1861,7 @@ svn_error_t *tdeio_svnProtocol::commitLogPrompt( const char **log_msg, const cha
 
 	kdDebug(9036) << " __TIME__ " << __TIME__ << endl;
 	if ( !p->dcopClient()->call( "kded","kdevsvnd","commitDialog(TQString)", params, replyType, reply ) ) {
-		kdWarning() << "Communication with KDED:TDevSvnd failed" << endl;
+		kdWarning() << "Communication with KDED:KDevSvnd failed" << endl;
 		svn_error_t *err = svn_error_create( SVN_ERR_EXTERNAL_PROGRAM, NULL,
 											 apr_pstrdup( pool, "Fail to call kded_kdevsvnd via DCOP. If this is your first problem, try to restart KDE" ) );
 		return err;