Revert "Finish renaming tdevelop components"

This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73.

23 files changed, 89 insertions, 89 deletions

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