Revert "Finish renaming tdevelop components"

This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73.

20 files changed, 115 insertions, 115 deletions

diff --git a/languages/cpp/pcsimporter/customimporter/CMakeLists.txt b/languages/cpp/pcsimporter/customimporter/CMakeLists.txt
index 90652509..c2e07bdb 100644
--- a/languages/cpp/pcsimporter/customimporter/CMakeLists.txt
+++ b/languages/cpp/pcsimporter/customimporter/CMakeLists.txt
@@ -24,14 +24,14 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevpcscustomimporter.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevpcscustomimporter.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### libtdevcustompcsimporter (module) #########
+##### libkdevcustompcsimporter (module) #########
 
-tde_add_kpart( libtdevcustompcsimporter AUTOMOC
+tde_add_kpart( libkdevcustompcsimporter AUTOMOC
   SOURCES
-    tdevcustomimporter.cpp settingsdialog.cpp
+    kdevcustomimporter.cpp settingsdialog.cpp
     settingsdialogbase.ui
   LINK lang_interfaces-shared tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/languages/cpp/pcsimporter/customimporter/Makefile.am b/languages/cpp/pcsimporter/customimporter/Makefile.am
index 1a6c1f1d..7e6a7093 100644
--- a/languages/cpp/pcsimporter/customimporter/Makefile.am
+++ b/languages/cpp/pcsimporter/customimporter/Makefile.am
@@ -1,12 +1,12 @@
 INCLUDES = -I$(top_srcdir)/languages/lib/interfaces \
 	-I$(top_srcdir)/lib/interfaces $(all_includes)
 METASOURCES = AUTO
-kde_module_LTLIBRARIES =  libtdevcustompcsimporter.la
+kde_module_LTLIBRARIES =  libkdevcustompcsimporter.la
 
 
-noinst_HEADERS =  tdevcustomimporter.h
-libtdevcustompcsimporter_la_SOURCES = tdevcustomimporter.cpp settingsdialog.cpp settingsdialogbase.ui
-libtdevcustompcsimporter_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
+noinst_HEADERS =  kdevcustomimporter.h
+libkdevcustompcsimporter_la_SOURCES = kdevcustomimporter.cpp settingsdialog.cpp settingsdialogbase.ui
+libkdevcustompcsimporter_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
 	$(top_builddir)/languages/lib/interfaces/liblang_interfaces.la
-libtdevcustompcsimporter_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
-kde_services_DATA = tdevpcscustomimporter.desktop
+libkdevcustompcsimporter_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
+kde_services_DATA = kdevpcscustomimporter.desktop
diff --git a/languages/cpp/pcsimporter/customimporter/tdevcustomimporter.cpp b/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.cpp
index 33a2bf40..38a41eb8 100644
--- a/languages/cpp/pcsimporter/customimporter/tdevcustomimporter.cpp
+++ b/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.cpp
@@ -7,7 +7,7 @@
 *   the Free Software Foundation; either version 2 of the License, or     *
 *   (at your option) any later version.                                   *
 ***************************************************************************/
-#include "tdevcustomimporter.h"
+#include "kdevcustomimporter.h"
 
 #include "settingsdialog.h"
 
@@ -17,24 +17,24 @@
 #include <kdebug.h>
 #include <kgenericfactory.h>
 
-K_EXPORT_COMPONENT_FACTORY( libtdevcustompcsimporter, KGenericFactory<TDevCustomImporter>( "tdevcustompcsimporter" ) )
+K_EXPORT_COMPONENT_FACTORY( libkdevcustompcsimporter, KGenericFactory<KDevCustomImporter>( "kdevcustompcsimporter" ) )
 
-TDevCustomImporter::TDevCustomImporter( TQObject* parent, const char* name, const TQStringList & // args
+KDevCustomImporter::KDevCustomImporter( TQObject* parent, const char* name, const TQStringList & // args
                                       )
-		: TDevPCSImporter( parent, name )
+		: KDevPCSImporter( parent, name )
 {}
 
 
-TDevCustomImporter::~TDevCustomImporter()
+KDevCustomImporter::~KDevCustomImporter()
 {}
 
 
-TQString TDevCustomImporter::dbName() const
+TQString KDevCustomImporter::dbName() const
 {
 	return m_settings->dbName();
 }
 
-TQStringList TDevCustomImporter::fileList( const TQString& path )
+TQStringList KDevCustomImporter::fileList( const TQString& path )
 {
 	TQDir dir( path );
 	if ( !dir.exists() )
@@ -49,7 +49,7 @@ TQStringList TDevCustomImporter::fileList( const TQString& path )
 	return fileList;
 }
 
-TQStringList TDevCustomImporter::fileList()
+TQStringList KDevCustomImporter::fileList()
 {
 	if ( !m_settings )
 		return TQStringList();
@@ -67,7 +67,7 @@ TQStringList TDevCustomImporter::fileList()
 	return files;
 }
 
-TQStringList TDevCustomImporter::includePaths()
+TQStringList KDevCustomImporter::includePaths()
 {
 	if ( !m_settings )
 		return TQStringList();
@@ -75,13 +75,13 @@ TQStringList TDevCustomImporter::includePaths()
 	return m_settings->dirs();
 }
 
-TQWidget* TDevCustomImporter::createSettingsPage( TQWidget* parent, const char* name )
+TQWidget* KDevCustomImporter::createSettingsPage( TQWidget* parent, const char* name )
 {
 	m_settings = new SettingsDialog( parent, name );
 	return m_settings;
 }
 
-void TDevCustomImporter::processDir( const TQString path, TQStringList & files )
+void KDevCustomImporter::processDir( const TQString path, TQStringList & files )
 {
 	TQValueStack<TQString> s;
 	s.push( path );
@@ -114,5 +114,5 @@ void TDevCustomImporter::processDir( const TQString path, TQStringList & files )
 	while ( !s.isEmpty() );
 }
 
-#include "tdevcustomimporter.moc" 
+#include "kdevcustomimporter.moc" 
 //kate: indent-mode csands; tab-width 4; space-indent off;
diff --git a/languages/cpp/pcsimporter/customimporter/tdevcustomimporter.h b/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.h
index 925e42f9..884a033d 100644
--- a/languages/cpp/pcsimporter/customimporter/tdevcustomimporter.h
+++ b/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.h
@@ -7,23 +7,23 @@
 *   the Free Software Foundation; either version 2 of the License, or     *
 *   (at your option) any later version.                                   *
 ***************************************************************************/
-#ifndef TDEVCUSTOMIMPORTER_H
-#define TDEVCUSTOMIMPORTER_H
+#ifndef KDEVCUSTOMIMPORTER_H
+#define KDEVCUSTOMIMPORTER_H
 
-#include "tdevpcsimporter.h"
+#include "kdevpcsimporter.h"
 
 #include <tqguardedptr.h>
 
 class SettingsDialog;
 
-class TDevCustomImporter : public TDevPCSImporter
+class KDevCustomImporter : public KDevPCSImporter
 {
 Q_OBJECT
   
 public:
-    TDevCustomImporter(TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList());
+    KDevCustomImporter(TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList());
 
-    ~TDevCustomImporter();
+    ~KDevCustomImporter();
 
     virtual TQString dbName() const;
     virtual TQStringList fileList();
diff --git a/languages/cpp/pcsimporter/customimporter/tdevpcscustomimporter.desktop b/languages/cpp/pcsimporter/customimporter/kdevpcscustomimporter.desktop
index 50530ef8..b351a8e3 100644
--- a/languages/cpp/pcsimporter/customimporter/tdevpcscustomimporter.desktop
+++ b/languages/cpp/pcsimporter/customimporter/kdevpcscustomimporter.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-Name=TDevPCSCustomImporter
+Name=KDevPCSCustomImporter
 Name[da]=TDevelop brugerdefineret PCS-importør
 Name[nds]=EgenPCS-Import för TDevelop
 Name[pl]=KDevWłasnyImportPCS
@@ -40,5 +40,5 @@ Comment[zh_CN]=TDevelop 自定义目录的 PCS 导入器
 Comment[zh_TW]=TDevelop 自訂目錄 PCS 匯入器
 Icon=gear
 ServiceTypes=TDevelop/PCSImporter
-X-TDE-Library=libtdevcustompcsimporter
+X-TDE-Library=libkdevcustompcsimporter
 X-TDevelop-PCSImporter=
diff --git a/languages/cpp/pcsimporter/qt4importer/CMakeLists.txt b/languages/cpp/pcsimporter/qt4importer/CMakeLists.txt
index 908c66fc..8e29fdec 100644
--- a/languages/cpp/pcsimporter/qt4importer/CMakeLists.txt
+++ b/languages/cpp/pcsimporter/qt4importer/CMakeLists.txt
@@ -24,14 +24,14 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevqt4importer.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevqt4importer.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### libtdevqt4importer (module) ###############
+##### libkdevqt4importer (module) ###############
 
-tde_add_kpart( libtdevqt4importer AUTOMOC
+tde_add_kpart( libkdevqt4importer AUTOMOC
   SOURCES
-    tdevqt4importer.cpp settingsdialogbase.ui
+    kdevqt4importer.cpp settingsdialogbase.ui
     settingsdialog.cpp
   LINK lang_interfaces-shared tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/languages/cpp/pcsimporter/qt4importer/Makefile.am b/languages/cpp/pcsimporter/qt4importer/Makefile.am
index 935c7d49..12f12104 100644
--- a/languages/cpp/pcsimporter/qt4importer/Makefile.am
+++ b/languages/cpp/pcsimporter/qt4importer/Makefile.am
@@ -1,11 +1,11 @@
 INCLUDES = -I$(top_srcdir)/languages/lib/interfaces \
         -I$(top_srcdir)/lib/interfaces $(all_includes)
 METASOURCES = AUTO
-kde_module_LTLIBRARIES =  libtdevqt4importer.la
+kde_module_LTLIBRARIES =  libkdevqt4importer.la
 
-noinst_HEADERS = tdevqt4importer.h settingsdialog.h
-libtdevqt4importer_la_SOURCES = tdevqt4importer.cpp settingsdialogbase.ui settingsdialog.cpp
-kde_services_DATA =  tdevqt4importer.desktop
-libtdevqt4importer_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
+noinst_HEADERS = kdevqt4importer.h settingsdialog.h
+libkdevqt4importer_la_SOURCES = kdevqt4importer.cpp settingsdialogbase.ui settingsdialog.cpp
+kde_services_DATA =  kdevqt4importer.desktop
+libkdevqt4importer_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
         $(top_builddir)/languages/lib/interfaces/liblang_interfaces.la
-libtdevqt4importer_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
+libkdevqt4importer_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
diff --git a/languages/cpp/pcsimporter/qt4importer/tdevqt4importer.cpp b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp
index fefa57ee..0289c7a4 100644
--- a/languages/cpp/pcsimporter/qt4importer/tdevqt4importer.cpp
+++ b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp
@@ -9,8 +9,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "tdevqt4importer.h"
-#include "tdevqt4importer.moc"
+#include "kdevqt4importer.h"
+#include "kdevqt4importer.moc"
 #include "settingsdialog.h"
 
 #include <kgenericfactory.h>
@@ -22,15 +22,15 @@
 #include <tqlabel.h>
 #include <tqdir.h>
 
-K_EXPORT_COMPONENT_FACTORY( libtdevqt4importer, KGenericFactory<TDevQt4Importer>( "tdevqt4importer" ) )
+K_EXPORT_COMPONENT_FACTORY( libkdevqt4importer, KGenericFactory<KDevQt4Importer>( "kdevqt4importer" ) )
 
-TDevQt4Importer::TDevQt4Importer( TQObject * parent, const char * name, const TQStringList& )
-    : TDevPCSImporter( parent, name )
+KDevQt4Importer::KDevQt4Importer( TQObject * parent, const char * name, const TQStringList& )
+    : KDevPCSImporter( parent, name )
 {
     m_qtfile = 0;
 }
 
-TDevQt4Importer::~TDevQt4Importer()
+KDevQt4Importer::~KDevQt4Importer()
 {
     if (m_qtfile)
         delete m_qtfile;
@@ -38,7 +38,7 @@ TDevQt4Importer::~TDevQt4Importer()
     m_qtfile = 0;
 }
 
-TQStringList TDevQt4Importer::fileList()
+TQStringList KDevQt4Importer::fileList()
 {
     if( !m_settings )
         return TQStringList();
@@ -86,7 +86,7 @@ TQStringList TDevQt4Importer::fileList()
     return m_qtfile->name();
 }
 
-TQStringList TDevQt4Importer::includePaths()
+TQStringList KDevQt4Importer::includePaths()
 {
     if( !m_settings || !m_qtfile)
         return TQStringList();
@@ -99,7 +99,7 @@ TQStringList TDevQt4Importer::includePaths()
     return includePaths;
 }
 
-TQWidget * TDevQt4Importer::createSettingsPage( TQWidget * parent, const char * name )
+TQWidget * KDevQt4Importer::createSettingsPage( TQWidget * parent, const char * name )
 {
     m_settings = new SettingsDialog( parent, name );
     return m_settings;
diff --git a/languages/cpp/pcsimporter/qt4importer/tdevqt4importer.desktop b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop
index cf42c497..5d91d917 100644
--- a/languages/cpp/pcsimporter/qt4importer/tdevqt4importer.desktop
+++ b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop
@@ -1,10 +1,10 @@
 [Desktop Entry]
 Type=Service
-Name=TDevQt4Importer
+Name=KDevQt4Importer
 Name[de]=Qt4-PCS-Import (TDevelop)
-Name[fr]=TDevQtImporter
+Name[fr]=KDevQtImporter
 Name[nds]=Qt4-PCS-Import (TDevelop)
-Name[ru]=TDevQt 4Importer
+Name[ru]=KDevQt 4Importer
 Name[sv]=TDevelop QT4-import
 Comment=TDevelop Qt4 PCS Importer
 Comment[ca]=Importador PCS de Qt4 per a TDevelop
@@ -29,6 +29,6 @@ Comment[sv]=TDevelop QT4 PCS-import
 Comment[zh_TW]=TDevelop Qt4 PCS 匯入器
 Icon=gear
 ServiceTypes=TDevelop/PCSImporter
-X-TDE-Library=libtdevqt4importer
+X-TDE-Library=libkdevqt4importer
 X-TDevelop-PCSImporter=
 X-TDevelop-Version=5
diff --git a/languages/cpp/pcsimporter/qt4importer/tdevqt4importer.h b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h
index 53f6a18e..3b9563f3 100644
--- a/languages/cpp/pcsimporter/qt4importer/tdevqt4importer.h
+++ b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h
@@ -9,22 +9,22 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef TDEVTQTIMPORTER_H
-#define TDEVTQTIMPORTER_H
+#ifndef KDEVTQTIMPORTER_H
+#define KDEVTQTIMPORTER_H
 
-#include <tdevpcsimporter.h>
+#include <kdevpcsimporter.h>
 #include <tqguardedptr.h>
 
 class SettingsDialog;
 class KTempFile;
 
-class TDevQt4Importer : public TDevPCSImporter
+class KDevQt4Importer : public KDevPCSImporter
 {
     Q_OBJECT
   
 public:
-    TDevQt4Importer( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() );
-    virtual ~TDevQt4Importer();
+    KDevQt4Importer( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() );
+    virtual ~KDevQt4Importer();
 
     virtual TQString dbName() const { return TQString::fromLatin1("TQt4"); }
     virtual TQStringList fileList();
diff --git a/languages/cpp/pcsimporter/qtimporter/CMakeLists.txt b/languages/cpp/pcsimporter/qtimporter/CMakeLists.txt
index 9af966d9..64e95d39 100644
--- a/languages/cpp/pcsimporter/qtimporter/CMakeLists.txt
+++ b/languages/cpp/pcsimporter/qtimporter/CMakeLists.txt
@@ -24,14 +24,14 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevqtimporter.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevqtimporter.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### libtdevqtimporter (module) ################
+##### libkdevqtimporter (module) ################
 
-tde_add_kpart( libtdevqtimporter AUTOMOC
+tde_add_kpart( libkdevqtimporter AUTOMOC
   SOURCES
-    tdevqtimporter.cpp settingsdialogbase.ui settingsdialog.cpp
+    kdevqtimporter.cpp settingsdialogbase.ui settingsdialog.cpp
   LINK lang_interfaces-shared tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/languages/cpp/pcsimporter/qtimporter/Makefile.am b/languages/cpp/pcsimporter/qtimporter/Makefile.am
index 23a60885..80ccc8be 100644
--- a/languages/cpp/pcsimporter/qtimporter/Makefile.am
+++ b/languages/cpp/pcsimporter/qtimporter/Makefile.am
@@ -1,11 +1,11 @@
 INCLUDES = -I$(top_srcdir)/languages/lib/interfaces \
 	-I$(top_srcdir)/lib/interfaces $(all_includes)
 METASOURCES = AUTO
-kde_module_LTLIBRARIES =  libtdevqtimporter.la
+kde_module_LTLIBRARIES =  libkdevqtimporter.la
 
-noinst_HEADERS = tdevqtimporter.h settingsdialog.h
-libtdevqtimporter_la_SOURCES = tdevqtimporter.cpp settingsdialogbase.ui settingsdialog.cpp
-kde_services_DATA =  tdevqtimporter.desktop
-libtdevqtimporter_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
+noinst_HEADERS = kdevqtimporter.h settingsdialog.h
+libkdevqtimporter_la_SOURCES = kdevqtimporter.cpp settingsdialogbase.ui settingsdialog.cpp
+kde_services_DATA =  kdevqtimporter.desktop
+libkdevqtimporter_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
 	$(top_builddir)/languages/lib/interfaces/liblang_interfaces.la
-libtdevqtimporter_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
+libkdevqtimporter_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
diff --git a/languages/cpp/pcsimporter/qtimporter/tdevqtimporter.cpp b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp
index b3b94019..62eb38fd 100644
--- a/languages/cpp/pcsimporter/qtimporter/tdevqtimporter.cpp
+++ b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp
@@ -9,8 +9,8 @@
 *                                                                         *
 ***************************************************************************/
 
-#include "tdevqtimporter.h"
-#include "tdevqtimporter.moc"
+#include "kdevqtimporter.h"
+#include "kdevqtimporter.moc"
 #include "settingsdialog.h"
 
 #include <kgenericfactory.h>
@@ -18,16 +18,16 @@
 #include <tqlabel.h>
 #include <tqdir.h>
 
-K_EXPORT_COMPONENT_FACTORY( libtdevqtimporter, KGenericFactory<TDevQtImporter>( "tdevqtimporter" ) )
+K_EXPORT_COMPONENT_FACTORY( libkdevqtimporter, KGenericFactory<KDevQtImporter>( "kdevqtimporter" ) )
 
-TDevQtImporter::TDevQtImporter( TQObject * parent, const char * name, const TQStringList& )
-		: TDevPCSImporter( parent, name )
+KDevQtImporter::KDevQtImporter( TQObject * parent, const char * name, const TQStringList& )
+		: KDevPCSImporter( parent, name )
 {}
 
-TDevQtImporter::~TDevQtImporter()
+KDevQtImporter::~KDevQtImporter()
 {}
 
-TQStringList TDevQtImporter::fileList()
+TQStringList KDevQtImporter::fileList()
 {
 	if ( !m_settings )
 		return TQStringList();
@@ -50,7 +50,7 @@ TQStringList TDevQtImporter::fileList()
 	return fileList;
 }
 
-TQStringList TDevQtImporter::includePaths()
+TQStringList KDevQtImporter::includePaths()
 {
 	if ( !m_settings )
 		return TQStringList();
@@ -64,7 +64,7 @@ TQStringList TDevQtImporter::includePaths()
 	return includePaths;
 }
 
-TQWidget * TDevQtImporter::createSettingsPage( TQWidget * parent, const char * name )
+TQWidget * KDevQtImporter::createSettingsPage( TQWidget * parent, const char * name )
 {
 	m_settings = new SettingsDialog( parent, name );
 	return m_settings;
diff --git a/languages/cpp/pcsimporter/qtimporter/tdevqtimporter.desktop b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop
index f9b02306..72161838 100644
--- a/languages/cpp/pcsimporter/qtimporter/tdevqtimporter.desktop
+++ b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-Name=TDevQtImporter
+Name=KDevQtImporter
 Name[da]=TDevelop Qt-importør
 Name[de]=Qt-PCS-Import (TDevelop)
 Name[hi]=के-डेव-क्यूटी-आयातक
@@ -32,6 +32,6 @@ Comment[sv]=TDevelop QT3 PCS-import
 Comment[zh_TW]=TDevelop Qt3 PCS 匯入器
 Icon=gear
 ServiceTypes=TDevelop/PCSImporter
-X-TDE-Library=libtdevqtimporter
+X-TDE-Library=libkdevqtimporter
 X-TDevelop-PCSImporter=
 X-TDevelop-Version=5
diff --git a/languages/cpp/pcsimporter/qtimporter/tdevqtimporter.h b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h
index 3f7d1ac8..bad9973e 100644
--- a/languages/cpp/pcsimporter/qtimporter/tdevqtimporter.h
+++ b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h
@@ -9,21 +9,21 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef TDEVTQTIMPORTER_H
-#define TDEVTQTIMPORTER_H
+#ifndef KDEVTQTIMPORTER_H
+#define KDEVTQTIMPORTER_H
 
-#include <tdevpcsimporter.h>
+#include <kdevpcsimporter.h>
 #include <tqguardedptr.h>
 
 class SettingsDialog;
 
-class TDevQtImporter : public TDevPCSImporter
+class KDevQtImporter : public KDevPCSImporter
 {
     Q_OBJECT
   
 public:
-    TDevQtImporter( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() );
-    virtual ~TDevQtImporter();
+    KDevQtImporter( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() );
+    virtual ~KDevQtImporter();
 
     virtual TQString dbName() const { return TQString::fromLatin1("TQt"); }
     virtual TQStringList fileList();
diff --git a/languages/cpp/pcsimporter/tdelibsimporter/CMakeLists.txt b/languages/cpp/pcsimporter/tdelibsimporter/CMakeLists.txt
index 4dbf0d0c..d48bad5a 100644
--- a/languages/cpp/pcsimporter/tdelibsimporter/CMakeLists.txt
+++ b/languages/cpp/pcsimporter/tdelibsimporter/CMakeLists.txt
@@ -24,14 +24,14 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevtdelibsimporter.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevtdelibsimporter.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### libtdevtdelibsimporter (module) ###########
+##### libkdevtdelibsimporter (module) ###########
 
-tde_add_kpart( libtdevtdelibsimporter AUTOMOC
+tde_add_kpart( libkdevtdelibsimporter AUTOMOC
   SOURCES
-    tdevtdelibsimporter.cpp settingsdialogbase.ui
+    kdevtdelibsimporter.cpp settingsdialogbase.ui
     settingsdialog.cpp
   LINK lang_interfaces-shared tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/languages/cpp/pcsimporter/tdelibsimporter/Makefile.am b/languages/cpp/pcsimporter/tdelibsimporter/Makefile.am
index e7c846d4..14efcabc 100644
--- a/languages/cpp/pcsimporter/tdelibsimporter/Makefile.am
+++ b/languages/cpp/pcsimporter/tdelibsimporter/Makefile.am
@@ -1,11 +1,11 @@
 INCLUDES = -I$(top_srcdir)/languages/lib/interfaces \
 	-I$(top_srcdir)/lib/interfaces $(all_includes)
 METASOURCES = AUTO
-kde_module_LTLIBRARIES =  libtdevtdelibsimporter.la
+kde_module_LTLIBRARIES =  libkdevtdelibsimporter.la
 
-noinst_HEADERS = tdevtdelibsimporter.h settingsdialog.h
-libtdevtdelibsimporter_la_SOURCES = tdevtdelibsimporter.cpp settingsdialogbase.ui settingsdialog.cpp
-kde_services_DATA =  tdevtdelibsimporter.desktop
-libtdevtdelibsimporter_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
+noinst_HEADERS = kdevtdelibsimporter.h settingsdialog.h
+libkdevtdelibsimporter_la_SOURCES = kdevtdelibsimporter.cpp settingsdialogbase.ui settingsdialog.cpp
+kde_services_DATA =  kdevtdelibsimporter.desktop
+libkdevtdelibsimporter_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
 	$(top_builddir)/languages/lib/interfaces/liblang_interfaces.la
-libtdevtdelibsimporter_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
+libkdevtdelibsimporter_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
diff --git a/languages/cpp/pcsimporter/tdelibsimporter/tdevtdelibsimporter.cpp b/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.cpp
index 6f83e483..d3f5795b 100644
--- a/languages/cpp/pcsimporter/tdelibsimporter/tdevtdelibsimporter.cpp
+++ b/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.cpp
@@ -9,8 +9,8 @@
 *                                                                         *
 ***************************************************************************/
 
-#include "tdevtdelibsimporter.h"
-#include "tdevtdelibsimporter.moc"
+#include "kdevtdelibsimporter.h"
+#include "kdevtdelibsimporter.moc"
 #include "settingsdialog.h"
 
 #include <kdebug.h>
@@ -21,16 +21,16 @@
 #include <tqdir.h>
 #include <tqcombobox.h>
 
-K_EXPORT_COMPONENT_FACTORY( libtdevtdelibsimporter, KGenericFactory<TDevTDELibsImporter>( "tdevtdelibsimporter" ) )
+K_EXPORT_COMPONENT_FACTORY( libkdevtdelibsimporter, KGenericFactory<KDevKDELibsImporter>( "kdevtdelibsimporter" ) )
 
-TDevTDELibsImporter::TDevTDELibsImporter( TQObject * parent, const char * name, const TQStringList& )
-		: TDevPCSImporter( parent, name )
+KDevKDELibsImporter::KDevKDELibsImporter( TQObject * parent, const char * name, const TQStringList& )
+		: KDevPCSImporter( parent, name )
 {}
 
-TDevTDELibsImporter::~TDevTDELibsImporter()
+KDevKDELibsImporter::~KDevKDELibsImporter()
 {}
 
-TQStringList TDevTDELibsImporter::fileList( const TQString& path )
+TQStringList KDevKDELibsImporter::fileList( const TQString& path )
 {
 	TQDir dir( path );
 	TQStringList lst = dir.entryList( "*.h" );
@@ -43,7 +43,7 @@ TQStringList TDevTDELibsImporter::fileList( const TQString& path )
 }
 
 
-TQStringList TDevTDELibsImporter::fileList()
+TQStringList KDevKDELibsImporter::fileList()
 {
 	if ( !m_settings )
 		return TQStringList();
@@ -99,7 +99,7 @@ TQStringList TDevTDELibsImporter::fileList()
 	return files;
 }
 
-TQStringList TDevTDELibsImporter::includePaths()
+TQStringList KDevKDELibsImporter::includePaths()
 {
 	if ( !m_settings )
 		return TQStringList();
@@ -109,7 +109,7 @@ TQStringList TDevTDELibsImporter::includePaths()
 	return includePaths;
 }
 
-TQWidget * TDevTDELibsImporter::createSettingsPage( TQWidget * parent, const char * name )
+TQWidget * KDevKDELibsImporter::createSettingsPage( TQWidget * parent, const char * name )
 {
 	m_settings = new SettingsDialog( parent, name );
 	return m_settings;
diff --git a/languages/cpp/pcsimporter/tdelibsimporter/tdevtdelibsimporter.desktop b/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.desktop
index 54cd2996..7433518e 100644
--- a/languages/cpp/pcsimporter/tdelibsimporter/tdevtdelibsimporter.desktop
+++ b/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Type=Service
-Name=TDevTDELibsImporter
+Name=KDevKDELibsImporter
 Name[da]=TDevelop KDELibs-importør
 Name[de]=KDELibs-PCS-Import (TDevelop)
 Name[hi]=के-डेव-केडीई-लिब्स-इम्पोर्टर
 Name[ja]=KDev KDE 
 Name[nds]=KDELibs-PCS-Import (TDevelop)
-Name[pl]=TDevTDEImportBib
+Name[pl]=KDevKDEImportBib
 Name[sk]=KDev KDE import knižníc
 Name[sv]=TDevelop KDE-biblioteksimport
 Name[ta]=கெடெவ் கெடெலிப்ஸ் இறக்குமதியாளர்
@@ -44,6 +44,6 @@ Comment[zh_CN]=TDevelop KDELibs PCS 导入器
 Comment[zh_TW]=TDevelop KDE 函式庫匯入器
 Icon=gear
 ServiceTypes=TDevelop/PCSImporter
-X-TDE-Library=libtdevtdelibsimporter
+X-TDE-Library=libkdevtdelibsimporter
 X-TDevelop-PCSImporter=
 X-TDevelop-Version=5
diff --git a/languages/cpp/pcsimporter/tdelibsimporter/tdevtdelibsimporter.h b/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.h
index 0d772bba..14fb7cff 100644
--- a/languages/cpp/pcsimporter/tdelibsimporter/tdevtdelibsimporter.h
+++ b/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.h
@@ -9,21 +9,21 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef TDEVTQTIMPORTER_H
-#define TDEVTQTIMPORTER_H
+#ifndef KDEVTQTIMPORTER_H
+#define KDEVTQTIMPORTER_H
 
-#include <tdevpcsimporter.h>
+#include <kdevpcsimporter.h>
 #include <tqguardedptr.h>
 
 class SettingsDialog;
 
-class TDevTDELibsImporter : public TDevPCSImporter
+class KDevKDELibsImporter : public KDevPCSImporter
 {
     Q_OBJECT
   
 public:
-    TDevTDELibsImporter( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() );
-    virtual ~TDevTDELibsImporter();
+    KDevKDELibsImporter( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() );
+    virtual ~KDevKDELibsImporter();
 
     virtual TQString dbName() const { return TQString::fromLatin1("KDElibs"); }
     virtual TQStringList fileList();