8 files changed, 46 insertions, 46 deletions
diff --git a/buildtools/qmake/CMakeLists.txt b/buildtools/qmake/CMakeLists.txt
index e2b877f5..fa281096 100644
--- a/buildtools/qmake/CMakeLists.txt
+++ b/buildtools/qmake/CMakeLists.txt
@@ -31,13 +31,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevtrollproject.desktop tdevtmakeproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES tdevtrollproject.rc DESTINATION ${DATA_INSTALL_DIR}/tdevtrollproject )
+install( FILES kdevtrollproject.desktop kdevtmakeproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevtrollproject.rc DESTINATION ${DATA_INSTALL_DIR}/kdevtrollproject )
 
 
-##### libtdevtrollproject (module) ##############
+##### libkdevtrollproject (module) ##############
 
-tde_add_kpart( libtdevtrollproject AUTOMOC
+tde_add_kpart( libkdevtrollproject AUTOMOC
   SOURCES
     choosesubprojectdlg.cpp choosesubprojectdlgbase.ui
     createscopedlg.cpp createscopedlgbase.ui
@@ -48,6 +48,6 @@ tde_add_kpart( libtdevtrollproject AUTOMOC
     qmakeoptionswidgetbase.ui qmakescopeitem.cpp
     scope.cpp trolllistview.cpp trollprojectpart.cpp
     trollprojectwidget.cpp
-  LINK tdevqmakeparser-shared tdevbuildbase-shared tdevbuildtoolswidgets-shared
+  LINK kdevqmakeparser-shared kdevbuildbase-shared kdevbuildtoolswidgets-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/buildtools/qmake/Makefile.am b/buildtools/qmake/Makefile.am
index 68adba76..b50fc775 100644
--- a/buildtools/qmake/Makefile.am
+++ b/buildtools/qmake/Makefile.am
@@ -8,14 +8,14 @@ INCLUDES = -I$(top_srcdir)/buildtools/lib/base \
 	-I$(top_builddir)/buildtools/lib/widgets $(all_includes)
 
 
-kde_module_LTLIBRARIES = libtdevtrollproject.la
-libtdevtrollproject_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevtrollproject_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
-	$(top_builddir)/lib/util/libtdevutil.la $(top_builddir)/buildtools/lib/widgets/libtdevbuildtoolswidgets.la \
-	$(top_builddir)/buildtools/lib/base/libtdevbuildbase.la \
-	$(top_builddir)/buildtools/lib/parsers/qmake/libtdevqmakeparser.la
-
-libtdevtrollproject_la_SOURCES = choosesubprojectdlg.cpp \
+kde_module_LTLIBRARIES = libkdevtrollproject.la
+libkdevtrollproject_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevtrollproject_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
+	$(top_builddir)/lib/util/libkdevutil.la $(top_builddir)/buildtools/lib/widgets/libkdevbuildtoolswidgets.la \
+	$(top_builddir)/buildtools/lib/base/libkdevbuildbase.la \
+	$(top_builddir)/buildtools/lib/parsers/qmake/libkdevqmakeparser.la
+
+libkdevtrollproject_la_SOURCES = choosesubprojectdlg.cpp \
 	choosesubprojectdlgbase.ui createscopedlg.cpp createscopedlgbase.ui disablesubprojectdlg.cpp \
 	disablesubprojectdlgbase.ui newwidgetdlg.cpp newwidgetdlgbase.ui \
 	projectconfigurationdlg.cpp projectconfigurationdlgbase.ui qmakedefaultopts.cpp \
@@ -26,9 +26,9 @@ libtdevtrollproject_la_SOURCES = choosesubprojectdlg.cpp \
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevtrollproject.desktop tdevtmakeproject.desktop
+service_DATA = kdevtrollproject.desktop kdevtmakeproject.desktop
 
-rcdir = $(kde_datadir)/tdevtrollproject
-rc_DATA = tdevtrollproject.rc
+rcdir = $(kde_datadir)/kdevtrollproject
+rc_DATA = kdevtrollproject.rc
 noinst_HEADERS = createscopedlg.h disablesubprojectdlg.h qmakedefaultopts.h \
 	qmakeoptionswidget.h qmakescopeitem.h trolllistview.h
diff --git a/buildtools/qmake/tdevtmakeproject.desktop b/buildtools/qmake/kdevtmakeproject.desktop
index a5b729d5..97b4b528 100644
--- a/buildtools/qmake/tdevtmakeproject.desktop
+++ b/buildtools/qmake/kdevtmakeproject.desktop
@@ -85,7 +85,7 @@ GenericName[tr]=TMake Projesi
 GenericName[zh_CN]=TMake 工程
 GenericName[zh_TW]=TMake 專案
 ServiceTypes=TDevelop/Project
-X-TDE-Library=libtdevtrollproject
+X-TDE-Library=libkdevtrollproject
 X-TDevelop-Version=5
 X-TDevelop-Args=TMake
 
diff --git a/buildtools/qmake/tdevtrollproject.desktop b/buildtools/qmake/kdevtrollproject.desktop
index 24ef620e..bf118c56 100644
--- a/buildtools/qmake/tdevtrollproject.desktop
+++ b/buildtools/qmake/kdevtrollproject.desktop
@@ -90,6 +90,6 @@ GenericName[uz@cyrillic]=QMake лойиҳаси
 GenericName[zh_CN]=QMake 工程
 GenericName[zh_TW]=QMake 專案
 ServiceTypes=TDevelop/Project
-X-TDE-Library=libtdevtrollproject
+X-TDE-Library=libkdevtrollproject
 X-TDevelop-Version=5
 X-TDevelop-Args=
diff --git a/buildtools/qmake/tdevtrollproject.rc b/buildtools/qmake/kdevtrollproject.rc
index 8f6e0048..8f6e0048 100644
--- a/buildtools/qmake/tdevtrollproject.rc
+++ b/buildtools/qmake/kdevtrollproject.rc
diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp
index 738e2534..c71afc30 100644
--- a/buildtools/qmake/trollprojectpart.cpp
+++ b/buildtools/qmake/trollprojectpart.cpp
@@ -27,7 +27,7 @@
 #include <kdirwatch.h>
 #include <kstatusbar.h>
 #include <tqmessagebox.h>
-#include <tdevgenericfactory.h>
+#include <kdevgenericfactory.h>
 #include <tdeaction.h>
 #include <tdeparts/part.h>
 #include <kprocess.h>
@@ -41,11 +41,11 @@
 
 
 #include "domutil.h"
-#include "tdevcore.h"
-#include "tdevmainwindow.h"
-#include "tdevmakefrontend.h"
-#include "tdevappfrontend.h"
-#include "tdevpartcontroller.h"
+#include "kdevcore.h"
+#include "kdevmainwindow.h"
+#include "kdevmakefrontend.h"
+#include "kdevappfrontend.h"
+#include "kdevpartcontroller.h"
 #include "trollprojectwidget.h"
 #include "runoptionswidget.h"
 #include "config.h"
@@ -53,15 +53,15 @@
 #include "qmakeoptionswidget.h"
 #include "scope.h"
 
-#include <tdevplugininfo.h>
+#include <kdevplugininfo.h>
 #include <urlutil.h>
 
-typedef TDevGenericFactory<TrollProjectPart> TrollProjectFactory;
-static const TDevPluginInfo data("tdevtrollproject");
-K_EXPORT_COMPONENT_FACTORY( libtdevtrollproject, TrollProjectFactory( data ) )
+typedef KDevGenericFactory<TrollProjectPart> TrollProjectFactory;
+static const KDevPluginInfo data("kdevtrollproject");
+K_EXPORT_COMPONENT_FACTORY( libkdevtrollproject, TrollProjectFactory( data ) )
 
 TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQStringList& args )
-    : TDevBuildTool(&data, parent, name ? name : "TrollProjectPart")
+    : KDevBuildTool(&data, parent, name ? name : "TrollProjectPart")
 {
     setInstance(TrollProjectFactory::instance());
 
@@ -70,7 +70,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS
     else
         m_tmakeProject = false;
 
-    setXMLFile("tdevtrollproject.rc");
+    setXMLFile("kdevtrollproject.rc");
 
     m_executeProjectAfterBuild = false;
     m_executeTargetAfterBuild = false;
@@ -405,7 +405,7 @@ void TrollProjectPart::openProject(const TQString &dirName, const TQString &proj
         DomUtil::writeEntry(dom, "/kdevtrollproject/run/directoryradio", "executable");
     }
 
-    TDevProject::openProject( dirName, projectName );
+    KDevProject::openProject( dirName, projectName );
 }
 
 
@@ -475,7 +475,7 @@ TQString TrollProjectPart::runDirectory() const
     TQString cwd;
     if( DomUtil::readBoolEntry(dom, "/kdevtrollproject/run/useglobalprogram", true) )
     {
-        cwd = defaultRunDirectory("tdevtrollproject");
+        cwd = defaultRunDirectory("kdevtrollproject");
     }else
     {
         TQString name = m_widget->getCurrentOutputFilename();
@@ -788,7 +788,7 @@ bool TrollProjectPart::isDirty()
     return false;
 }
 
-TDevProject::Options TrollProjectPart::options( ) const
+KDevProject::Options TrollProjectPart::options( ) const
 {
     return UsesTQMakeBuildSystem;
 }
diff --git a/buildtools/qmake/trollprojectpart.h b/buildtools/qmake/trollprojectpart.h
index 2b673b59..e36ef202 100644
--- a/buildtools/qmake/trollprojectpart.h
+++ b/buildtools/qmake/trollprojectpart.h
@@ -21,14 +21,14 @@
 #include <tqmap.h>
 #include <tqdatetime.h>
 
-#include "tdevbuildtool.h"
+#include "kdevbuildtool.h"
 
 class KDialogBase;
 class TrollProjectWidget;
 class KDirWatch;
 class TQMakeDefaultOpts;
 
-class TrollProjectPart : public TDevBuildTool
+class TrollProjectPart : public KDevBuildTool
 {
     Q_OBJECT
   
diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp
index 12d814a5..68dfad8e 100644
--- a/buildtools/qmake/trollprojectwidget.cpp
+++ b/buildtools/qmake/trollprojectwidget.cpp
@@ -60,14 +60,14 @@
 #include <tdeio/netaccess.h>
 #include <kurlcompletion.h>
 
-#include "tdevcore.h"
-#include "tdevpartcontroller.h"
-#include "tdevmainwindow.h"
+#include "kdevcore.h"
+#include "kdevpartcontroller.h"
+#include "kdevmainwindow.h"
 #include "trollprojectpart.h"
-#include "tdevappfrontend.h"
-#include "tdevmakefrontend.h"
-#include "tdevlanguagesupport.h"
-#include "tdevcreatefile.h"
+#include "kdevappfrontend.h"
+#include "kdevmakefrontend.h"
+#include "kdevlanguagesupport.h"
+#include "kdevcreatefile.h"
 #include "subclassesdlg.h"
 #include "addfilesdialog.h"
 #include "urlutil.h"
@@ -1403,7 +1403,7 @@ void TrollProjectWidget::slotNewFile()
             return ;
         }
     }
-    TDevCreateFile * createFileSupport = m_part->extension<TDevCreateFile>( "TDevelop/CreateFile" );
+    KDevCreateFile * createFileSupport = m_part->extension<KDevCreateFile>( "TDevelop/CreateFile" );
     TQString fcext;
     if( gitem )
     {
@@ -1437,7 +1437,7 @@ void TrollProjectWidget::slotNewFile()
                 fcext = TQString();
         }
     }
-    TDevCreateFile::CreatedFile crFile =
+    KDevCreateFile::CreatedFile crFile =
     createFileSupport->createNewFile( fcext, projectDirectory() + TQString(TQChar(TQDir::separator()))+ m_shownSubproject->relativePath() );
 }
 
@@ -1683,7 +1683,7 @@ void TrollProjectWidget::slotDetailsContextMenu( TDEListView *, TQListViewItem *
         }
         else if ( r == idInsNewFile )
         {
-            TDevCreateFile * createFileSupport = m_part->extension<TDevCreateFile>( "TDevelop/CreateFile" );
+            KDevCreateFile * createFileSupport = m_part->extension<KDevCreateFile>( "TDevelop/CreateFile" );
             TQString fcext;
             switch ( titem->groupType )
             {
@@ -1714,7 +1714,7 @@ void TrollProjectWidget::slotDetailsContextMenu( TDEListView *, TQListViewItem *
                 default:
                     fcext = TQString();
             }
-            TDevCreateFile::CreatedFile crFile =
+            KDevCreateFile::CreatedFile crFile =
                 createFileSupport->createNewFile( fcext, cleanSubprojectPath );
 
         }