Revert "Finish renaming tdevelop components"

This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73.

12 files changed, 40 insertions, 40 deletions

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; }