Revert "Finish renaming tdevelop components"

This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73.

16 files changed, 85 insertions, 85 deletions

diff --git a/parts/filecreate/CMakeLists.txt b/parts/filecreate/CMakeLists.txt
index 5655e7b9..a562f8e1 100644
--- a/parts/filecreate/CMakeLists.txt
+++ b/parts/filecreate/CMakeLists.txt
@@ -31,13 +31,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevfilecreate.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES tdevpart_filecreate.rc template-info.xml DESTINATION ${DATA_INSTALL_DIR}/tdevfilecreate )
+install( FILES kdevfilecreate.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevpart_filecreate.rc template-info.xml DESTINATION ${DATA_INSTALL_DIR}/kdevfilecreate )
 
 
-##### libtdevfilecreate (module) ################
+##### libkdevfilecreate (module) ################
 
-tde_add_kpart( libtdevfilecreate AUTOMOC
+tde_add_kpart( libkdevfilecreate AUTOMOC
   SOURCES
     filecreate_part.cpp filecreate_listitem.cpp
     filecreate_filetype.cpp filecreate_filedialog.cpp
diff --git a/parts/filecreate/Makefile.am b/parts/filecreate/Makefile.am
index ca0f1790..efe204d9 100644
--- a/parts/filecreate/Makefile.am
+++ b/parts/filecreate/Makefile.am
@@ -5,11 +5,11 @@ SUBDIRS = file-templates
 INCLUDES = -I$(top_srcdir)/lib/interfaces \
 	-I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util $(all_includes)
 
-kde_module_LTLIBRARIES = libtdevfilecreate.la
-libtdevfilecreate_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevfilecreate_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libkdevfilecreate.la
+libkdevfilecreate_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevfilecreate_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libtdevfilecreate_la_SOURCES = filecreate_part.cpp filecreate_listitem.cpp \
+libkdevfilecreate_la_SOURCES = filecreate_part.cpp filecreate_listitem.cpp \
 	filecreate_filetype.cpp filecreate_filedialog.cpp fcconfigwidgetbase.ui fcconfigwidget.cpp \
 	fctypeeditbase.ui fctypeedit.cpp fctemplateeditbase.ui fctemplateedit.cpp \
 	filecreate_newfile.cpp
@@ -17,7 +17,7 @@ libtdevfilecreate_la_SOURCES = filecreate_part.cpp filecreate_listitem.cpp \
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevfilecreate.desktop
+service_DATA = kdevfilecreate.desktop
 
-rcdir = $(kde_datadir)/tdevfilecreate
-rc_DATA = tdevpart_filecreate.rc template-info.xml
+rcdir = $(kde_datadir)/kdevfilecreate
+rc_DATA = kdevpart_filecreate.rc template-info.xml
diff --git a/parts/filecreate/README.dox b/parts/filecreate/README.dox
index fc0fbc76..34a7882d 100644
--- a/parts/filecreate/README.dox
+++ b/parts/filecreate/README.dox
@@ -20,7 +20,7 @@ Example XML:
 
 <code>
 \verbatim
-  <tdevfilecreate>
+  <kdevfilecreate>
     <filetypes>
       <type ext="py" name="Python" create="template"/>
       <type ext="ui" name="QT Designer" create="template">
@@ -28,7 +28,7 @@ Example XML:
          <subtype ref="mainwin" name="Main window"/>
       </type>
     </filetypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
 \endverbatim
 </code>
 
@@ -36,14 +36,14 @@ You can also use global template definitions supplied with the FileCreate part:
 
 <code>
 \verbatim
-  <tdevfilecreate>
+  <kdevfilecreate>
     <useglobaltypes>
       <type ext="ui" />
     </useglobaltypes>
     <filetypes>
       <type ext="py" name="Python" create="template"/>
     </filetypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
 \endverbatim
 </code>
 
diff --git a/parts/filecreate/fcconfigwidget.cpp b/parts/filecreate/fcconfigwidget.cpp
index 14066c11..7c6fabc4 100644
--- a/parts/filecreate/fcconfigwidget.cpp
+++ b/parts/filecreate/fcconfigwidget.cpp
@@ -35,8 +35,8 @@
 #include "fcconfigwidget.h"
 #include "filecreate_part.h"
 #include "filecreate_filetype.h"
-#include "tdevproject.h"
-#include "tdevpartcontroller.h"
+#include "kdevproject.h"
+#include "kdevpartcontroller.h"
 
 
 FCConfigWidget::FCConfigWidget(FileCreatePart * part, bool global, TQWidget *parent, const char *name):
@@ -90,7 +90,7 @@ void FCConfigWidget::accept()
 
 void FCConfigWidget::loadGlobalConfig(TQListView *view, bool checkmarks)
 {
-    TQString globalXMLFile = ::locate("data", "tdevfilecreate/template-info.xml");
+    TQString globalXMLFile = ::locate("data", "kdevfilecreate/template-info.xml");
     TQDomDocument globalDom;
     if (!globalXMLFile.isNull() &&
         DomUtil::openDOMFile(globalDom,globalXMLFile)) {
@@ -103,7 +103,7 @@ void FCConfigWidget::loadGlobalConfig(TQListView *view, bool checkmarks)
     if (checkmarks)
     {
         TQDomElement useGlobalTypes =
-            DomUtil::elementByPath(*(m_part->projectDom()),"/tdevfilecreate/useglobaltypes");
+            DomUtil::elementByPath(*(m_part->projectDom()),"/kdevfilecreate/useglobaltypes");
         for(TQDomNode node = useGlobalTypes.firstChild(); !node.isNull();node=node.nextSibling())
         {
             if (node.isElement() && node.nodeName()=="type")
@@ -171,14 +171,14 @@ void FCConfigWidget::saveGlobalConfig()
     TQDomDocument globalDom;
     TQDomElement  element = globalDom.createElement("tdevelop" );
     globalDom.appendChild(element);
-    TQDomElement  apPart  = globalDom.createElement("tdevfilecreate");
+    TQDomElement  apPart  = globalDom.createElement("kdevfilecreate");
     element.appendChild(apPart);
     TQDomElement fileTypes = globalDom.createElement( "filetypes" );
     apPart.appendChild( fileTypes );
 
     saveConfiguration(globalDom, fileTypes, true);
 
-    TQFile config( TDEGlobal::dirs()->saveLocation("data", "tdevfilecreate/", true) + "template-info.xml" );
+    TQFile config( TDEGlobal::dirs()->saveLocation("data", "kdevfilecreate/", true) + "template-info.xml" );
     config.open(IO_WriteOnly | IO_Truncate);
     TQTextStream stream(&config);
     stream << "<?xml version = '1.0'?>";
@@ -190,10 +190,10 @@ void FCConfigWidget::saveProjectConfig()
 {
     TQDomDocument dom     = *m_part->projectDom( );
     TQDomElement  element = dom.documentElement( );
-    TQDomElement  apPart  = element.namedItem( "tdevfilecreate" ).toElement( );
+    TQDomElement  apPart  = element.namedItem( "kdevfilecreate" ).toElement( );
     if( apPart.isNull( ) )
     {
-        apPart = dom.createElement( "tdevfilecreate" );
+        apPart = dom.createElement( "kdevfilecreate" );
         element.appendChild( apPart );
     }
 
@@ -291,7 +291,7 @@ void FCConfigWidget::saveConfiguration(TQDomDocument &dom, TQDomElement &element
             {
                 TQString dest;
                 if (global)
-                    dest = TDEGlobal::dirs()->saveLocation("data", "/tdevfilecreate/file-templates/", true);
+                    dest = TDEGlobal::dirs()->saveLocation("data", "/kdevfilecreate/file-templates/", true);
                 else
                     dest = m_part->project()->projectDirectory() + "/templates/";
                 if (it.current()->text(4) == "create")
@@ -318,7 +318,7 @@ void FCConfigWidget::saveConfiguration(TQDomDocument &dom, TQDomElement &element
                 {
                     TQString dest;
                     if (global)
-                        dest = TDEGlobal::dirs()->saveLocation("data", "/tdevfilecreate/file-templates/", true);
+                        dest = TDEGlobal::dirs()->saveLocation("data", "/kdevfilecreate/file-templates/", true);
                     else
                         dest = m_part->project()->projectDirectory() + "/templates/";
                     if (lastChild->text(4) == "create")
@@ -440,7 +440,7 @@ void FCConfigWidget::copyToProject_button_clicked()
                 it->parent()->text(1),
                 it->parent()->text(2),
                 it->parent()->text(3),
-                locate("data", "tdevfilecreate/file-templates/"+ it->parent()->text(0)));
+                locate("data", "kdevfilecreate/file-templates/"+ it->parent()->text(0)));
             destParent += it->parent()->text(0) + "-";
             TQCheckListItem *chk = dynamic_cast<TQCheckListItem*>(it->parent());
             if (chk)
@@ -452,13 +452,13 @@ void FCConfigWidget::copyToProject_button_clicked()
                 it->text(1),
                 it->text(2),
                 it->text(3),
-                locate("data", "tdevfilecreate/file-templates/"+destParent + it->text(0)));
+                locate("data", "kdevfilecreate/file-templates/"+destParent + it->text(0)));
         else
             it_copy = new TQListViewItem(fc_view, it->text(0),
                 it->text(1),
                 it->text(2),
                 it->text(3),
-                locate("data", "tdevfilecreate/file-templates/" +destParent+ it->text(0)));
+                locate("data", "kdevfilecreate/file-templates/" +destParent+ it->text(0)));
         TQCheckListItem *chk = dynamic_cast<TQCheckListItem*>(it);
         if (chk)
             chk->setOn(false);
@@ -470,7 +470,7 @@ void FCConfigWidget::copyToProject_button_clicked()
                 it_child->text(1),
                 it_child->text(2),
                 it_child->text(3),
-                locate("data", "tdevfilecreate/file-templates/"+ it_copy->text(0) + "-" + it_child->text(0)));
+                locate("data", "kdevfilecreate/file-templates/"+ it_copy->text(0) + "-" + it_child->text(0)));
             TQCheckListItem *chk_child = dynamic_cast<TQCheckListItem*>(it_child);
             if (chk_child)
                 chk_child->setOn(false);
@@ -683,7 +683,7 @@ void FCConfigWidget::edit_type_content_button_clicked( )
     }
     else
     {
-        TQString dest = TDEGlobal::dirs()->saveLocation("data", "/tdevfilecreate/file-templates/", true);
+        TQString dest = TDEGlobal::dirs()->saveLocation("data", "/kdevfilecreate/file-templates/", true);
         TQString typePath = dest + type_name;
         KURL content;
         content.setPath(typePath);
@@ -691,7 +691,7 @@ void FCConfigWidget::edit_type_content_button_clicked( )
         {
             TQFileInfo fi(dest+type_name);
             if (!fi.exists())
-                copyTemplate(locate("data", "tdevfilecreate/file-templates/" + type_name), dest, type_name);
+                copyTemplate(locate("data", "kdevfilecreate/file-templates/" + type_name), dest, type_name);
             m_part->partController()->editDocument(content);
         }
         else
diff --git a/parts/filecreate/file-templates/CMakeLists.txt b/parts/filecreate/file-templates/CMakeLists.txt
index 37b9a309..04405e1a 100644
--- a/parts/filecreate/file-templates/CMakeLists.txt
+++ b/parts/filecreate/file-templates/CMakeLists.txt
@@ -14,4 +14,4 @@ install( FILES
     ui-dialogr ui-tabdialog ui-wizard dox ts ui-mainwin-qt4
     ui-widget-qt4 ui-dialogb-qt4 ui-dialogr-qt4 ui-dialog-qt4
     qrc
-  DESTINATION ${DATA_INSTALL_DIR}/tdevfilecreate/file-templates )
+  DESTINATION ${DATA_INSTALL_DIR}/kdevfilecreate/file-templates )
diff --git a/parts/filecreate/file-templates/Makefile.am b/parts/filecreate/file-templates/Makefile.am
index 631e3554..672a1cfa 100644
--- a/parts/filecreate/file-templates/Makefile.am
+++ b/parts/filecreate/file-templates/Makefile.am
@@ -1,2 +1,2 @@
-rcdir = $(kde_datadir)/tdevfilecreate/file-templates
+rcdir = $(kde_datadir)/kdevfilecreate/file-templates
 rc_DATA = ui ui-dialog ui-mainwin ui-confdialog ui-dialogb ui-widget ui-dialogr ui-tabdialog ui-wizard dox ts ui-mainwin-qt4 ui-widget-qt4 ui-dialogb-qt4 ui-dialogr-qt4 ui-dialog-qt4 qrc
diff --git a/parts/filecreate/filecreate_filedialog.h b/parts/filecreate/filecreate_filedialog.h
index 616e9c2d..54365717 100644
--- a/parts/filecreate/filecreate_filedialog.h
+++ b/parts/filecreate/filecreate_filedialog.h
@@ -10,8 +10,8 @@
 
 
 
-#ifndef __TDEVPART_FILECREATE_FILEDIALOG_H__
-#define __TDEVPART_FILECREATE_FILEDIALOG_H__
+#ifndef __KDEVPART_FILECREATE_FILEDIALOG_H__
+#define __KDEVPART_FILECREATE_FILEDIALOG_H__
 
 #include <tdefiledialog.h>
 
diff --git a/parts/filecreate/filecreate_part.cpp b/parts/filecreate/filecreate_part.cpp
index 11fcfa6c..19deeb66 100644
--- a/parts/filecreate/filecreate_part.cpp
+++ b/parts/filecreate/filecreate_part.cpp
@@ -19,7 +19,7 @@
 #include <tdeversion.h>
 #include <kiconloader.h>
 #include <tdelocale.h>
-#include <tdevgenericfactory.h>
+#include <kdevgenericfactory.h>
 #include <tdefiledialog.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
@@ -30,10 +30,10 @@
 #include <tdepopupmenu.h>
 #include <tdemessagebox.h>
 
-#include "tdevcore.h"
-#include "tdevmainwindow.h"
-#include "tdevproject.h"
-#include "tdevpartcontroller.h"
+#include "kdevcore.h"
+#include "kdevmainwindow.h"
+#include "kdevproject.h"
+#include "kdevpartcontroller.h"
 #include "configwidgetproxy.h"
 
 #include "filetemplate.h"
@@ -50,23 +50,23 @@
 #define PROJECTSETTINGSPAGE 1
 #define GLOBALSETTINGSPAGE 2
 
-#include "tdevplugininfo.h"
+#include "kdevplugininfo.h"
 
 #include "config.h"
 
-static const TDevPluginInfo data("tdevfilecreate");
+static const KDevPluginInfo data("kdevfilecreate");
 
-typedef TDevGenericFactory<FileCreatePart> FileCreateFactory;
-K_EXPORT_COMPONENT_FACTORY( libtdevfilecreate, FileCreateFactory( data ) )
+typedef KDevGenericFactory<FileCreatePart> FileCreateFactory;
+K_EXPORT_COMPONENT_FACTORY( libkdevfilecreate, FileCreateFactory( data ) )
 
 using namespace FileCreate;
 
 FileCreatePart::FileCreatePart(TQObject *parent, const char *name, const TQStringList & )
-//    : TDevCreateFile(&data, parent, name ? name : "FileCreatePart"), m_selectedWidget(-1), m_useSideTab(true), m_subPopups(0)
-    : TDevCreateFile(&data, parent, name ? name : "FileCreatePart"), m_subPopups(0)
+//    : KDevCreateFile(&data, parent, name ? name : "FileCreatePart"), m_selectedWidget(-1), m_useSideTab(true), m_subPopups(0)
+    : KDevCreateFile(&data, parent, name ? name : "FileCreatePart"), m_subPopups(0)
 {
   setInstance(FileCreateFactory::instance());
-  setXMLFile("tdevpart_filecreate.rc");
+  setXMLFile("kdevpart_filecreate.rc");
 
   connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) );
   connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(slotProjectClosed()) );
@@ -179,10 +179,10 @@ void FileCreatePart::slotNewFilePopup( int pFileType )
 }
 
 void FileCreatePart::slotNewFile() {
-  TDevCreateFile::CreatedFile createdFile = createNewFile();
-  if (createdFile.status == TDevCreateFile::CreatedFile::STATUS_NOTCREATED)
+  KDevCreateFile::CreatedFile createdFile = createNewFile();
+  if (createdFile.status == KDevCreateFile::CreatedFile::STATUS_NOTCREATED)
     KMessageBox::error(0, i18n("Cannot create file. Check whether the directory and filename are valid."));
-  else if (createdFile.status != TDevCreateFile::CreatedFile::STATUS_CANCELED)
+  else if (createdFile.status != KDevCreateFile::CreatedFile::STATUS_CANCELED)
     openCreatedFile(createdFile);
 }
 
@@ -209,7 +209,7 @@ void FileCreatePart::slotProjectClosed() {
 
 void FileCreatePart::slotFiletypeSelected(const FileType * filetype) {
 
-  TDevCreateFile::CreatedFile createdFile = createNewFile(filetype->ext(),
+  KDevCreateFile::CreatedFile createdFile = createNewFile(filetype->ext(),
                                                           TQString(),
                                                           TQString(),
                                                           filetype->subtypeRef());
@@ -217,9 +217,9 @@ void FileCreatePart::slotFiletypeSelected(const FileType * filetype) {
   openCreatedFile(createdFile);
 }
 
-void FileCreatePart::openCreatedFile(const TDevCreateFile::CreatedFile & createdFile)
+void FileCreatePart::openCreatedFile(const KDevCreateFile::CreatedFile & createdFile)
 {
-  if ( createdFile.status == TDevCreateFile::CreatedFile::STATUS_OK )
+  if ( createdFile.status == KDevCreateFile::CreatedFile::STATUS_OK )
   {
     KURL uu( createdFile.dir + "/" + createdFile.filename );
     partController()->editDocument ( uu );
@@ -228,7 +228,7 @@ void FileCreatePart::openCreatedFile(const TDevCreateFile::CreatedFile & created
 
 int FileCreatePart::readTypes(const TQDomDocument & dom, TQPtrList<FileType> &m_filetypes, bool enable) {
   int numRead = 0;
-  TQDomElement fileTypes = DomUtil::elementByPath(dom,"/tdevfilecreate/filetypes");
+  TQDomElement fileTypes = DomUtil::elementByPath(dom,"/kdevfilecreate/filetypes");
   if (!fileTypes.isNull()) {
     for(TQDomNode node = fileTypes.firstChild();!node.isNull();node=node.nextSibling()) {
 
@@ -324,16 +324,16 @@ FileType * FileCreatePart::getEnabledType(const TQString & ex, const TQString su
   return NULL;
 }
 
-// TDevFileCreate interface
+// KDevFileCreate interface
 
-TDevCreateFile::CreatedFile FileCreatePart::createNewFile(TQString ext, TQString dir, TQString name, TQString subtype)
+KDevCreateFile::CreatedFile FileCreatePart::createNewFile(TQString ext, TQString dir, TQString name, TQString subtype)
 {
-  TDevCreateFile::CreatedFile result;
+  KDevCreateFile::CreatedFile result;
 
   KURL projectURL;
   if ( !project() )
   {
-    //result.status = TDevCreateFile::CreatedFile::STATUS_NOTCREATED;
+    //result.status = KDevCreateFile::CreatedFile::STATUS_NOTCREATED;
     //return result;
   }
   else
@@ -373,7 +373,7 @@ TDevCreateFile::CreatedFile FileCreatePart::createNewFile(TQString ext, TQString
   int dialogResult = dialog.exec();
 
   if (dialogResult == KDialogBase::Rejected) {
-    result.status = TDevCreateFile::CreatedFile::STATUS_CANCELED;
+    result.status = KDevCreateFile::CreatedFile::STATUS_CANCELED;
     return result;
   }
 
@@ -383,8 +383,8 @@ TDevCreateFile::CreatedFile FileCreatePart::createNewFile(TQString ext, TQString
   selectedURL = dialog.url();
   const FileType *selectedFileType = dialog.selectedType();
 
-  if (dialog.addToProject() && !projectURL.isParentOf(selectedURL) && !(project()->options() & TDevProject::UsesTQMakeBuildSystem) ) {
-    result.status = TDevCreateFile::CreatedFile::STATUS_NOTWITHINPROJECT;
+  if (dialog.addToProject() && !projectURL.isParentOf(selectedURL) && !(project()->options() & KDevProject::UsesTQMakeBuildSystem) ) {
+    result.status = KDevCreateFile::CreatedFile::STATUS_NOTWITHINPROJECT;
     return result;
   }
 
@@ -416,7 +416,7 @@ TDevCreateFile::CreatedFile FileCreatePart::createNewFile(TQString ext, TQString
   }
   if (!created)
   {
-      result.status = TDevCreateFile::CreatedFile::STATUS_NOTCREATED;
+      result.status = KDevCreateFile::CreatedFile::STATUS_NOTCREATED;
       return result;
   }
 
@@ -425,7 +425,7 @@ TDevCreateFile::CreatedFile FileCreatePart::createNewFile(TQString ext, TQString
     // work out the path relative to the project directory
 //    TQString relToProj = URLUtil::relativePath(projectURL, selectedURL, URLUtil::SLASH_PREFIX );
 	  TQString relToProj;
-	  if( project()->options() & TDevProject::UsesTQMakeBuildSystem )
+	  if( project()->options() & KDevProject::UsesTQMakeBuildSystem )
 	  {
 		relToProj = URLUtil::relativePathToFile( project()->projectDirectory(), fullPath );
 		  project()->addFile(relToProj);
@@ -445,7 +445,7 @@ TDevCreateFile::CreatedFile FileCreatePart::createNewFile(TQString ext, TQString
 
   result.filename = fileName;
   result.dir = URLUtil::directory(fullPath);
-  result.status = TDevCreateFile::CreatedFile::STATUS_OK;
+  result.status = KDevCreateFile::CreatedFile::STATUS_OK;
 
   return result;
 }
@@ -464,7 +464,7 @@ void FileCreatePart::slotInitialize( )
 
   // read in which global templates are to be used for this project
   TQDomElement useGlobalTypes =
-    DomUtil::elementByPath(*projectDom(),"/tdevfilecreate/useglobaltypes");
+    DomUtil::elementByPath(*projectDom(),"/kdevfilecreate/useglobaltypes");
   for(TQDomNode node = useGlobalTypes.firstChild();
       !node.isNull();node=node.nextSibling()) {
 
@@ -524,7 +524,7 @@ TQString FileCreatePart::findGlobalXMLFile() const
 {
   int version = 0;
   TQString filename;
-  TQStringList filenames = TDEGlobal::instance()->dirs()->findAllResources("data", "tdevfilecreate/template-info.xml");
+  TQStringList filenames = TDEGlobal::instance()->dirs()->findAllResources("data", "kdevfilecreate/template-info.xml");
   for( TQStringList::const_iterator it = filenames.begin(); it != filenames.end(); ++it )
   {
     TQDomDocument globalDom;
diff --git a/parts/filecreate/filecreate_part.h b/parts/filecreate/filecreate_part.h
index 0b6e5a01..9d090493 100644
--- a/parts/filecreate/filecreate_part.h
+++ b/parts/filecreate/filecreate_part.h
@@ -10,16 +10,16 @@
 
 
 
-#ifndef __TDEVPART_FILECREATE_H__
-#define __TDEVPART_FILECREATE_H__
+#ifndef __KDEVPART_FILECREATE_H__
+#define __KDEVPART_FILECREATE_H__
 
 
 #include <tqguardedptr.h>
 #include <tqptrlist.h>
 
 #include <tqwidget.h>
-#include <tdevplugin.h>
-#include <tdevcreatefile.h>
+#include <kdevplugin.h>
+#include <kdevcreatefile.h>
 
 #include "filecreate_typechooser.h"
 
@@ -36,7 +36,7 @@ class ConfigWidgetProxy;
 
 using namespace FileCreate;
 
-class FileCreatePart : public TDevCreateFile
+class FileCreatePart : public KDevCreateFile
 {
   Q_OBJECT
   
@@ -57,7 +57,7 @@ public:
    * The user will be prompted as necessary for the missing information, and the
    * file created, and added to the project as necessary.
    */
-  virtual TDevCreateFile::CreatedFile createNewFile(TQString ext = TQString(),
+  virtual KDevCreateFile::CreatedFile createNewFile(TQString ext = TQString(),
                      TQString dir = TQString(),
                      TQString name = TQString(),
                      TQString subtype = TQString());
@@ -106,7 +106,7 @@ private:
   /**
    * If a file has been successfully created, open it
    */
-  void openCreatedFile(const TDevCreateFile::CreatedFile & createdFile);
+  void openCreatedFile(const KDevCreateFile::CreatedFile & createdFile);
 
   /**
    * Reads in file type definitions from a config DOM and adds them
diff --git a/parts/filecreate/filecreate_widget2.cpp b/parts/filecreate/filecreate_widget2.cpp
index d57fbf48..4638725c 100644
--- a/parts/filecreate/filecreate_widget2.cpp
+++ b/parts/filecreate/filecreate_widget2.cpp
@@ -19,9 +19,9 @@
 #include <kiconloader.h>
 #include <tdelocale.h>
 
-#include <tdevcore.h>
+#include <kdevcore.h>
 
-#include "tdevproject.h"
+#include "kdevproject.h"
 #include "filecreate_part.h"
 #include "filecreate_widget2.h"
 #include "filecreate_filetype.h"
diff --git a/parts/filecreate/filecreate_widget2.h b/parts/filecreate/filecreate_widget2.h
index 3e4df801..217d37ce 100644
--- a/parts/filecreate/filecreate_widget2.h
+++ b/parts/filecreate/filecreate_widget2.h
@@ -21,7 +21,7 @@
 #include "filecreate_typechooser.h"
 
 class TDEIconLoader;
-class TDevProject;
+class KDevProject;
 class FileCreatePart;
 
 namespace FileCreate {
diff --git a/parts/filecreate/filecreate_widget3.cpp b/parts/filecreate/filecreate_widget3.cpp
index e541038c..caf1ac74 100644
--- a/parts/filecreate/filecreate_widget3.cpp
+++ b/parts/filecreate/filecreate_widget3.cpp
@@ -18,11 +18,11 @@
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <tdevcore.h>
+#include <kdevcore.h>
 
 #include "filecreate_widget3.h"
 
-#include "tdevproject.h"
+#include "kdevproject.h"
 #include "filecreate_part.h"
 #include "filecreate_filetype.h"
 #include "filecreate_listitem.h"
@@ -30,7 +30,7 @@
 namespace FileCreate {
 
   ListWidget::ListWidget(FileCreatePart *part)
-    : TDEListView(0, "TDevFileCreate"), TypeChooser(part)
+    : TDEListView(0, "KDevFileCreate"), TypeChooser(part)
   {
     setIcon( SmallIcon("filenew2") );
     setCaption(i18n("File Create"));
diff --git a/parts/filecreate/filecreate_widget3.h b/parts/filecreate/filecreate_widget3.h
index 244bf78d..ac8b866e 100644
--- a/parts/filecreate/filecreate_widget3.h
+++ b/parts/filecreate/filecreate_widget3.h
@@ -19,7 +19,7 @@
 
 #include "filecreate_typechooser.h"
 
-class TDevProject;
+class KDevProject;
 class FileCreatePart;
 class TQResizeEvent;
 
diff --git a/parts/filecreate/tdevfilecreate.desktop b/parts/filecreate/kdevfilecreate.desktop
index d9accc3c..1861090d 100644
--- a/parts/filecreate/tdevfilecreate.desktop
+++ b/parts/filecreate/kdevfilecreate.desktop
@@ -30,7 +30,7 @@ Comment[ta]= கோப்பு உருவாக்கப்பட்டது
 Comment[tg]=Устои бунёд кардани файлҳо
 Comment[zh_CN]=文件创建
 Comment[zh_TW]=檔案建立
-Name=TDevFileCreate
+Name=KDevFileCreate
 Name[da]=TDevelop filoprettelse
 Name[de]=Dateierstellungs-Komponente (TDevelop)
 Name[hi]=के-डेव-फ़ाइल-क्रिएट
@@ -71,7 +71,7 @@ GenericName[zh_CN]=文件创建
 GenericName[zh_TW]=檔案建立
 Icon=wizard
 ServiceTypes=TDevelop/CreateFile
-X-TDE-Library=libtdevfilecreate
+X-TDE-Library=libkdevfilecreate
 X-TDevelop-Version=5
 X-TDevelop-Properties=FileCreation
 X-TDevelop-Scope=Core
diff --git a/parts/filecreate/tdevpart_filecreate.rc b/parts/filecreate/kdevpart_filecreate.rc
index 09a293ee..401a1378 100644
--- a/parts/filecreate/tdevpart_filecreate.rc
+++ b/parts/filecreate/kdevpart_filecreate.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartplugin name="TDevFileCreate" library="libfilecreateplugin" version="3">
+<kpartplugin name="KDevFileCreate" library="libfilecreateplugin" version="3">
 <MenuBar>
  <Menu name="file">
     <Action name="file_new" group="new_merge" />
diff --git a/parts/filecreate/template-info.xml b/parts/filecreate/template-info.xml
index 9afd9825..664fa376 100644
--- a/parts/filecreate/template-info.xml
+++ b/parts/filecreate/template-info.xml
@@ -1,6 +1,6 @@
 <?xml version = '1.0'?>
 <tdevelop version="1">
-  <tdevfilecreate>
+  <kdevfilecreate>
     <sidetab active="no">
     </sidetab>
     <filetypes>
@@ -177,5 +177,5 @@
         <descr>A new empty Qt Linguist translation source file.</descr>
       </type>
     </filetypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
 </tdevelop>