12 files changed, 48 insertions, 48 deletions
diff --git a/languages/bash/CMakeLists.txt b/languages/bash/CMakeLists.txt
index 9998693d..eca8c096 100644
--- a/languages/bash/CMakeLists.txt
+++ b/languages/bash/CMakeLists.txt
@@ -29,13 +29,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevbashsupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kdevbashsupport.rc DESTINATION ${DATA_INSTALL_DIR}/kdevbashsupport )
+install( FILES tdevbashsupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevbashsupport.rc DESTINATION ${DATA_INSTALL_DIR}/tdevbashsupport )
 
 
-##### libkdevbashsupport (module) ###############
+##### libtdevbashsupport (module) ###############
 
-tde_add_kpart( libkdevbashsupport AUTOMOC
+tde_add_kpart( libtdevbashsupport AUTOMOC
   SOURCES bashsupport_part.cpp
   LINK tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/languages/bash/Makefile.am b/languages/bash/Makefile.am
index 5916563a..2f750d63 100644
--- a/languages/bash/Makefile.am
+++ b/languages/bash/Makefile.am
@@ -5,16 +5,16 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \
 	$(all_includes)
 SUBDIRS = app_templates doc
 
-kde_module_LTLIBRARIES = libkdevbashsupport.la
-libkdevbashsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevbashsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libtdevbashsupport.la
+libtdevbashsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevbashsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libkdevbashsupport_la_SOURCES = bashsupport_part.cpp
+libtdevbashsupport_la_SOURCES = bashsupport_part.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevbashsupport.desktop
+service_DATA = tdevbashsupport.desktop
 
-rcdir = $(kde_datadir)/kdevbashsupport
-rc_DATA = kdevbashsupport.rc
+rcdir = $(kde_datadir)/tdevbashsupport
+rc_DATA = tdevbashsupport.rc
diff --git a/languages/bash/app_templates/bashhello/CMakeLists.txt b/languages/bash/app_templates/bashhello/CMakeLists.txt
index 69abf15c..0c002f83 100644
--- a/languages/bash/app_templates/bashhello/CMakeLists.txt
+++ b/languages/bash/app_templates/bashhello/CMakeLists.txt
@@ -15,8 +15,8 @@ add_custom_target( bashhello.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/bashhello.tar.gz bashhello.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 install( FILES
-    bashhello.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    bashhello.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/bash/app_templates/bashhello/Makefile.am b/languages/bash/app_templates/bashhello/Makefile.am
index b26692b4..ed84d271 100644
--- a/languages/bash/app_templates/bashhello/Makefile.am
+++ b/languages/bash/app_templates/bashhello/Makefile.am
@@ -2,10 +2,10 @@ dataFiles = app.sh app.tdevelop
 templateName = bashhello
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/bash/app_templates/bashhello/app.tdevelop b/languages/bash/app_templates/bashhello/app.tdevelop
index cab08799..bbc04992 100644
--- a/languages/bash/app_templates/bashhello/app.tdevelop
+++ b/languages/bash/app_templates/bashhello/app.tdevelop
@@ -11,22 +11,22 @@
   </keywords>
   <ignoreparts>
    <part>KDevdistpart</part>
-   <part>KDevDebugger</part>
+   <part>TDevDebugger</part>
   </ignoreparts>
  </general>
- <kdevscriptproject>
+ <tdevscriptproject>
   <general>
 		<activedir>src</activedir>
 		<includepatterns>*.sh</includepatterns>
 		<excludepatterns>*~</excludepatterns>
   </general>
- </kdevscriptproject>
- <kdevfileview>
+ </tdevscriptproject>
+ <tdevfileview>
 	 <groups>
 	   <group pattern="*.sh" name="Scripts" />
 	 </groups>
- </kdevfileview>
- <kdevdoctreeview>
+ </tdevfileview>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -73,10 +73,10 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </kdevdoctreeview>
-  <kdevfilecreate>
+ </tdevdoctreeview>
+  <tdevfilecreate>
     <useglobaltypes>
 			<type ext="sh"/>
     </useglobaltypes>
-  </kdevfilecreate>
+  </tdevfilecreate>
 </tdevelop>
diff --git a/languages/bash/app_templates/bashhello/bashhello.kdevtemplate b/languages/bash/app_templates/bashhello/bashhello.tdevtemplate
index b9e7bd11..b9e7bd11 100644
--- a/languages/bash/app_templates/bashhello/bashhello.kdevtemplate
+++ b/languages/bash/app_templates/bashhello/bashhello.tdevtemplate
diff --git a/languages/bash/bashsupport_part.cpp b/languages/bash/bashsupport_part.cpp
index 9f1be201..7cfd9889 100644
--- a/languages/bash/bashsupport_part.cpp
+++ b/languages/bash/bashsupport_part.cpp
@@ -14,7 +14,7 @@
 
 #include <kiconloader.h>
 #include <tdelocale.h>
-#include <kdevgenericfactory.h>
+#include <tdevgenericfactory.h>
 #include <kprocess.h>
 #include <kdebug.h>
 #include <tdeaction.h>
@@ -22,25 +22,25 @@
 #include <kdialogbase.h>
 
 
-#include <kdevcore.h>
-#include <kdevmainwindow.h>
-#include <kdevlanguagesupport.h>
-#include <kdevpartcontroller.h>
-#include <kdevproject.h>
-#include <kdevappfrontend.h>
-#include <kdevplugininfo.h>
+#include <tdevcore.h>
+#include <tdevmainwindow.h>
+#include <tdevlanguagesupport.h>
+#include <tdevpartcontroller.h>
+#include <tdevproject.h>
+#include <tdevappfrontend.h>
+#include <tdevplugininfo.h>
 #include <domutil.h>
 #include <codemodel.h>
 
-typedef KDevGenericFactory<BashSupportPart> BashSupportFactory;
-static const KDevPluginInfo data("kdevbashsupport");
-K_EXPORT_COMPONENT_FACTORY( libkdevbashsupport, BashSupportFactory( data ) )
+typedef TDevGenericFactory<BashSupportPart> BashSupportFactory;
+static const TDevPluginInfo data("tdevbashsupport");
+K_EXPORT_COMPONENT_FACTORY( libtdevbashsupport, BashSupportFactory( data ) )
 
 BashSupportPart::BashSupportPart(TQObject *parent, const char *name, const TQStringList& )
-: KDevLanguageSupport (&data, parent, name ? name : "BashSupportPart" )
+: TDevLanguageSupport (&data, parent, name ? name : "BashSupportPart" )
 {
 	setInstance(BashSupportFactory::instance());
-	setXMLFile("kdevbashsupport.rc");
+	setXMLFile("tdevbashsupport.rc");
 
 	TDEAction *action;
 	action = new TDEAction( i18n("&Run"), "exec",Key_F9,this, TQT_SLOT(slotRun()),actionCollection(), "build_execute" );
@@ -182,12 +182,12 @@ void BashSupportPart::savedFile(const KURL &fileName)
 void BashSupportPart::startApplication(const TQString &program)
 {
 	kdDebug() << "starting application" << program << endl;
-	if (KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("TDevelop/AppFrontend"))
+	if (TDevAppFrontend *appFrontend = extension<TDevAppFrontend>("TDevelop/AppFrontend"))
 		appFrontend->startAppCommand(TQString(), program, TRUE);
 }
 
 
-KDevLanguageSupport::Features BashSupportPart::features()
+TDevLanguageSupport::Features BashSupportPart::features()
 {
 	return Features(Variables | Functions);
 }
diff --git a/languages/bash/bashsupport_part.h b/languages/bash/bashsupport_part.h
index 284e4f4c..b1fff80e 100644
--- a/languages/bash/bashsupport_part.h
+++ b/languages/bash/bashsupport_part.h
@@ -3,8 +3,8 @@
  */
 
 
-#ifndef __KDEVPART_BASHSUPPORT_H__
-#define __KDEVPART_BASHSUPPORT_H__
+#ifndef __TDEVPART_BASHSUPPORT_H__
+#define __TDEVPART_BASHSUPPORT_H__
 
 
 #include <tqguardedptr.h>
@@ -13,8 +13,8 @@
 #include <kdialogbase.h>
 
 #include <codemodel.h>
-#include <kdevplugin.h>
-#include <kdevlanguagesupport.h>
+#include <tdevplugin.h>
+#include <tdevlanguagesupport.h>
 
 #include <tdetexteditor/editinterface.h>
 #include <tdetexteditor/viewcursorinterface.h>
@@ -47,7 +47,7 @@ class BashCodeCompletion : TQObject
 		KTextEditor::ViewCursorInterface *m_cursorInterface;
 };
 
-class BashSupportPart : public KDevLanguageSupport
+class BashSupportPart : public TDevLanguageSupport
 {
 	Q_OBJECT
   
diff --git a/languages/bash/doc/CMakeLists.txt b/languages/bash/doc/CMakeLists.txt
index 0d2d2a83..09ad4e33 100644
--- a/languages/bash/doc/CMakeLists.txt
+++ b/languages/bash/doc/CMakeLists.txt
@@ -11,4 +11,4 @@
 
 install( FILES
     bash.toc bash_bugs.toc
-  DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/tocs )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevdocumentation/tocs )
diff --git a/languages/bash/doc/Makefile.am b/languages/bash/doc/Makefile.am
index 1474d939..ab1c4f52 100644
--- a/languages/bash/doc/Makefile.am
+++ b/languages/bash/doc/Makefile.am
@@ -1,4 +1,4 @@
-tocdir = ${kde_datadir}/kdevdocumentation/tocs
+tocdir = ${kde_datadir}/tdevdocumentation/tocs
 toc_DATA = bash.toc bash_bugs.toc
 
 #indexdir = ${kde_datadir}/devdoctreeview/indices
diff --git a/languages/bash/kdevbashsupport.desktop b/languages/bash/tdevbashsupport.desktop
index 91a98e3e..854201e7 100644
--- a/languages/bash/kdevbashsupport.desktop
+++ b/languages/bash/tdevbashsupport.desktop
@@ -80,6 +80,6 @@ GenericName[tr]=Bash Desteği
 GenericName[zh_CN]=Bash 支持
 GenericName[zh_TW]=Bash 支援
 ServiceTypes=TDevelop/LanguageSupport
-X-TDE-Library=libkdevbashsupport
+X-TDE-Library=libtdevbashsupport
 X-TDevelop-Version=5
 X-TDevelop-Language=Bash
diff --git a/languages/bash/kdevbashsupport.rc b/languages/bash/tdevbashsupport.rc
index d4592d6b..d4592d6b 100644
--- a/languages/bash/kdevbashsupport.rc
+++ b/languages/bash/tdevbashsupport.rc