Rename a number of libraries and executables to avoid conflicts with KDE4

54 files changed, 112 insertions, 112 deletions

diff --git a/parts/abbrev/abbrevpart.cpp b/parts/abbrev/abbrevpart.cpp
index 5aeeb62c..3abe3b09 100644
--- a/parts/abbrev/abbrevpart.cpp
+++ b/parts/abbrev/abbrevpart.cpp
@@ -22,7 +22,7 @@
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <klocale.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <kstandarddirs.h>
 #include <kdevgenericfactory.h>
 #include <kaction.h>
@@ -31,10 +31,10 @@
 #include <kiconloader.h>
 #include <kdevplugininfo.h>
 
-#include <ktexteditor/document.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/codecompletioninterface.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/codecompletioninterface.h>
 
 #include "kdevcore.h"
 #include "kdevpartcontroller.h"
diff --git a/parts/abbrev/abbrevpart.h b/parts/abbrev/abbrevpart.h
index db2833fc..5fb37e97 100644
--- a/parts/abbrev/abbrevpart.h
+++ b/parts/abbrev/abbrevpart.h
@@ -20,7 +20,7 @@
 #include <tqptrlist.h>
 #include "kdevplugin.h"
 
-#include <ktexteditor/codecompletioninterface.h>
+#include <tdetexteditor/codecompletioninterface.h>
 
 class KDialogBase;
 
diff --git a/parts/appwizard/appwizarddlg.cpp b/parts/appwizard/appwizarddlg.cpp
index d9725ba4..11552b27 100644
--- a/parts/appwizard/appwizarddlg.cpp
+++ b/parts/appwizard/appwizarddlg.cpp
@@ -51,7 +51,7 @@
 #include <kpopupmenu.h>
 
 #include <ktrader.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <kio/netaccess.h>
 #include <tqfile.h>
 #include <kmacroexpander.h>
diff --git a/parts/appwizard/common/incadmin/ltmain.sh b/parts/appwizard/common/incadmin/ltmain.sh
index 3506ead3..f5fb19b4 100644
--- a/parts/appwizard/common/incadmin/ltmain.sh
+++ b/parts/appwizard/common/incadmin/ltmain.sh
@@ -7148,7 +7148,7 @@ EOF
 	  k=1
 
 	  if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
-	    output=${output_objdir}/${output_la}.lnkscript
+	    output=${output_objdir}/${output_la}.lntdescript
 	    func_verbose "creating GNU ld script: $output"
 	    $ECHO 'INPUT (' > $output
 	    for obj in $save_libobjs
diff --git a/parts/appwizard/importdlg.cpp b/parts/appwizard/importdlg.cpp
index c0d05a77..34b5422c 100644
--- a/parts/appwizard/importdlg.cpp
+++ b/parts/appwizard/importdlg.cpp
@@ -34,7 +34,7 @@
 #include <kfile.h>
 #include <kurlrequester.h>
 #include <ktrader.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <kprocess.h>
 
 #include "kdevcore.h"
diff --git a/parts/astyle/astyle_part.cpp b/parts/astyle/astyle_part.cpp
index 620315d3..18675ad5 100644
--- a/parts/astyle/astyle_part.cpp
+++ b/parts/astyle/astyle_part.cpp
@@ -10,12 +10,12 @@
 #include <kdevgenericfactory.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kparts/part.h>
-#include <kparts/partmanager.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/document.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/selectioninterface.h>
+#include <tdeparts/part.h>
+#include <tdeparts/partmanager.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/selectioninterface.h>
 #include <kprogress.h>
 #include <kdevcore.h>
 #include <kdevapi.h>
diff --git a/parts/astyle/astyle_part.h b/parts/astyle/astyle_part.h
index 3bc36ff2..eed15022 100644
--- a/parts/astyle/astyle_part.h
+++ b/parts/astyle/astyle_part.h
@@ -9,7 +9,7 @@
 class KDialogBase;
 #include <kdevsourceformatter.h>
 #include <kaction.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <kdevplugin.h>
 #include <kdebug.h>
 #include <tqmap.h>
diff --git a/parts/bookmarks/bookmarks_part.cpp b/parts/bookmarks/bookmarks_part.cpp
index 965b359b..733d2010 100644
--- a/parts/bookmarks/bookmarks_part.cpp
+++ b/parts/bookmarks/bookmarks_part.cpp
@@ -19,9 +19,9 @@
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kdevgenericfactory.h>
-#include <ktexteditor/markinterface.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/document.h>
+#include <tdetexteditor/markinterface.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/document.h>
 #include <kaction.h>
 #include <kdialogbase.h>
 
diff --git a/parts/bookmarks/bookmarks_part.h b/parts/bookmarks/bookmarks_part.h
index 311f66f8..f51603d7 100644
--- a/parts/bookmarks/bookmarks_part.h
+++ b/parts/bookmarks/bookmarks_part.h
@@ -19,7 +19,7 @@
 #include <tqdict.h>
 #include <tqpair.h>
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <kurl.h>
 
 #include <kdevplugin.h>
diff --git a/parts/bookmarks/bookmarks_widget.cpp b/parts/bookmarks/bookmarks_widget.cpp
index e4fb531c..a5eec6a3 100644
--- a/parts/bookmarks/bookmarks_widget.cpp
+++ b/parts/bookmarks/bookmarks_widget.cpp
@@ -15,7 +15,7 @@
 #include <tqpair.h>
 #include <tqstylesheet.h>
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <klibloader.h>
 #include <kurl.h>
 #include <kdebug.h>
diff --git a/parts/classview/classviewpart.cpp b/parts/classview/classviewpart.cpp
index 649db134..a30f6158 100644
--- a/parts/classview/classviewpart.cpp
+++ b/parts/classview/classviewpart.cpp
@@ -50,12 +50,12 @@
 
 #include "klistviewaction.h"
 
-#include <ktexteditor/document.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/view.h>
-#include <ktexteditor/selectioninterface.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/clipboardinterface.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/view.h>
+#include <tdetexteditor/selectioninterface.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/clipboardinterface.h>
 
 
 class FunctionCompletion : public CustomCompleter {
diff --git a/parts/classview/navigator.cpp b/parts/classview/navigator.cpp
index 5379119c..b24917df 100644
--- a/parts/classview/navigator.cpp
+++ b/parts/classview/navigator.cpp
@@ -27,7 +27,7 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kapplication.h>
-#include <ktexteditor/viewcursorinterface.h>
+#include <tdetexteditor/viewcursorinterface.h>
 
 #include <kcomboview.h>
 #include <klistviewaction.h>
diff --git a/parts/ctags2/ctags2_part.cpp b/parts/ctags2/ctags2_part.cpp
index 3b9d2768..fef1372e 100644
--- a/parts/ctags2/ctags2_part.cpp
+++ b/parts/ctags2/ctags2_part.cpp
@@ -19,10 +19,10 @@
 #include <klistview.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kparts/part.h>
-#include <ktexteditor/document.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/viewcursorinterface.h>
+#include <tdeparts/part.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/viewcursorinterface.h>
 #include <kprocess.h>
 #include <kdebug.h>
 #include <kstringhandler.h>
diff --git a/parts/diff/diffpart.cpp b/parts/diff/diffpart.cpp
index 97adaf4f..2f899828 100644
--- a/parts/diff/diffpart.cpp
+++ b/parts/diff/diffpart.cpp
@@ -22,8 +22,8 @@
 #include <kprocess.h>
 #include <kio/jobclasses.h>
 #include <kio/job.h>
-#include <kparts/part.h>
-#include <ktexteditor/editinterface.h>
+#include <tdeparts/part.h>
+#include <tdetexteditor/editinterface.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
 #include <kiconloader.h>
diff --git a/parts/diff/diffwidget.cpp b/parts/diff/diffwidget.cpp
index 681c09d1..539108e1 100644
--- a/parts/diff/diffwidget.cpp
+++ b/parts/diff/diffwidget.cpp
@@ -25,8 +25,8 @@
 #include <kfiledialog.h>
 #include <kmessagebox.h>
 
-#include <kparts/componentfactory.h>
-#include <kparts/part.h>
+#include <tdeparts/componentfactory.h>
+#include <tdeparts/part.h>
 
 #include <kio/jobclasses.h>
 #include <kio/job.h>
diff --git a/parts/distpart/distpart_widget.cpp b/parts/distpart/distpart_widget.cpp
index 90f66120..40d482b5 100644
--- a/parts/distpart/distpart_widget.cpp
+++ b/parts/distpart/distpart_widget.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "distpart_widget.h"
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <klibloader.h>
 #include <kurl.h>
 #include <kdebug.h>
diff --git a/parts/documentation/CMakeLists.txt b/parts/documentation/CMakeLists.txt
index 0fa6cdca..accc3401 100644
--- a/parts/documentation/CMakeLists.txt
+++ b/parts/documentation/CMakeLists.txt
@@ -53,6 +53,6 @@ tde_add_kpart( libkdevdocumentation AUTOMOC
     docprojectconfigwidget.cpp KDevDocumentationIface.cpp
     KDevDocumentationIface.skel addcatalogdlgbase.ui
     addcatalogdlg.cpp
-  LINK documentation_interfaces-shared tdevelop-shared khtml-shared
+  LINK documentation_interfaces-shared tdevelop-shared tdehtml-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/parts/documentation/bookmarkview.cpp b/parts/documentation/bookmarkview.cpp
index 6ee782ee..0ca74f43 100644
--- a/parts/documentation/bookmarkview.cpp
+++ b/parts/documentation/bookmarkview.cpp
@@ -30,8 +30,8 @@
 #include <kpushbutton.h>
 #include <kurlrequester.h>
 #include <kpopupmenu.h>
-#include <kparts/part.h>
-#include <khtml_part.h>
+#include <tdeparts/part.h>
+#include <tdehtml_part.h>
 #include <dom/html_document.h>
 
 #include <kdevpartcontroller.h>
diff --git a/parts/documentation/docglobalconfigwidget.cpp b/parts/documentation/docglobalconfigwidget.cpp
index 0b04548d..21fc1b5b 100644
--- a/parts/documentation/docglobalconfigwidget.cpp
+++ b/parts/documentation/docglobalconfigwidget.cpp
@@ -35,8 +35,8 @@
 #include <kapplication.h>
 #include <kurlrequester.h>
 #include <kfontcombo.h>
-#include <khtml_part.h>
-#include <khtml_settings.h>
+#include <tdehtml_part.h>
+#include <tdehtml_settings.h>
 
 #include "kdevdocumentationplugin.h"
 #include "kdevpartcontroller.h"
diff --git a/parts/documentation/documentation_part.cpp b/parts/documentation/documentation_part.cpp
index 32b08323..77b4e6b2 100644
--- a/parts/documentation/documentation_part.cpp
+++ b/parts/documentation/documentation_part.cpp
@@ -35,7 +35,7 @@
 #include <klocale.h>
 #include <ktrader.h>
 #include <kdebug.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <kservice.h>
 #include <kdialogbase.h>
 #include <kaction.h>
@@ -46,7 +46,7 @@
 #include <kstringhandler.h>
 #include <kconfig.h>
 #include <twin.h>
-#include <ktexteditor/document.h>
+#include <tdetexteditor/document.h>
 
 #include "kdevplugininfo.h"
 #include "kdevcore.h"
diff --git a/parts/documentation/documentation_widget.cpp b/parts/documentation/documentation_widget.cpp
index 84d8eada..567237e2 100644
--- a/parts/documentation/documentation_widget.cpp
+++ b/parts/documentation/documentation_widget.cpp
@@ -23,7 +23,7 @@
 #include <tqtoolbox.h>
 
 #include <klineedit.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <klibloader.h>
 #include <kurl.h>
 #include <klocale.h>
diff --git a/parts/documentation/interfaces/Makefile.am b/parts/documentation/interfaces/Makefile.am
index 93f5e7a0..6e66b46c 100644
--- a/parts/documentation/interfaces/Makefile.am
+++ b/parts/documentation/interfaces/Makefile.am
@@ -10,7 +10,7 @@ partincludedir_HEADERS = kdevdocumentationplugin.h
 servicetypedir = $(kde_servicetypesdir)
 servicetype_DATA = tdevelopdocumentationplugins.desktop
 
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils kdevutil kdevinterfaces
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevutil kdevinterfaces
 DOXYGEN_PROJECTNAME = KDevelop Documentation Part Interfaces Library
 DOXYGEN_DOCDIRPREFIX = kdevdoc
 include ../../../Doxyfile.am
diff --git a/parts/documentation/protocols/chm/Makefile.am b/parts/documentation/protocols/chm/Makefile.am
index eba29efd..d68f20bd 100644
--- a/parts/documentation/protocols/chm/Makefile.am
+++ b/parts/documentation/protocols/chm/Makefile.am
@@ -9,7 +9,7 @@ kio_chm_la_LIBADD = $(LIB_KIO)
 kio_chm_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 libkchmpart_la_SOURCES = kchmpart.cpp
-libkchmpart_la_LIBADD = -lkhtml $(LIB_KPARTS) $(top_builddir)/lib/widgets/libkdevwidgets.la
+libkchmpart_la_LIBADD = -ltdehtml $(LIB_KPARTS) $(top_builddir)/lib/widgets/libkdevwidgets.la
 libkchmpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
 
 noinst_HEADERS = chm.h chmfile.h decompress.h kchmpart.h
diff --git a/parts/documentation/protocols/chm/kchmpart.h b/parts/documentation/protocols/chm/kchmpart.h
index 1ec2eaf8..f8779d75 100644
--- a/parts/documentation/protocols/chm/kchmpart.h
+++ b/parts/documentation/protocols/chm/kchmpart.h
@@ -17,10 +17,10 @@
 #ifndef __kchmpart_h__
 #define __kchmpart_h__
 
-#include <kparts/factory.h>
-#include <kparts/part.h>
-#include <kparts/browserextension.h>
-#include <khtml_part.h>
+#include <tdeparts/factory.h>
+#include <tdeparts/part.h>
+#include <tdeparts/browserextension.h>
+#include <tdehtml_part.h>
 #include <kio/job.h>
 #include <kio/jobclasses.h>
 #include <kdevhtmlpart.h>
diff --git a/parts/documentation/tools/htdig/Makefile.am b/parts/documentation/tools/htdig/Makefile.am
index b46c07e7..303ff645 100644
--- a/parts/documentation/tools/htdig/Makefile.am
+++ b/parts/documentation/tools/htdig/Makefile.am
@@ -1,6 +1,6 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes)
 METASOURCES = AUTO
 bin_PROGRAMS =  tdevelop-htdig
-tdevelop_htdig_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+tdevelop_htdig_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 tdevelop_htdig_SOURCES = htdigindex.cpp
 noinst_HEADERS =  htdigindex.h
diff --git a/parts/doxygen/doxygenpart.cpp b/parts/doxygen/doxygenpart.cpp
index f267fec9..50c916f2 100644
--- a/parts/doxygen/doxygenpart.cpp
+++ b/parts/doxygen/doxygenpart.cpp
@@ -31,10 +31,10 @@
 #include <kaction.h>
 #include <kmessagebox.h>
 #include <kmainwindow.h>
-#include <kparts/part.h>
-#include <ktexteditor/document.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/editinterface.h>
+#include <tdeparts/part.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/editinterface.h>
 #include <partcontroller.h>
 #include <kdialogbase.h>
 #include <kdevplugininfo.h>
diff --git a/parts/filecreate/filecreate_widget2.cpp b/parts/filecreate/filecreate_widget2.cpp
index f2d67f25..59ec1a33 100644
--- a/parts/filecreate/filecreate_widget2.cpp
+++ b/parts/filecreate/filecreate_widget2.cpp
@@ -12,7 +12,7 @@
 #include <tqtimer.h>
 #include <tqwhatsthis.h>
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <klibloader.h>
 #include <kurl.h>
 #include <kdebug.h>
diff --git a/parts/filecreate/filecreate_widget3.cpp b/parts/filecreate/filecreate_widget3.cpp
index 5d307bff..2bc308b6 100644
--- a/parts/filecreate/filecreate_widget3.cpp
+++ b/parts/filecreate/filecreate_widget3.cpp
@@ -12,7 +12,7 @@
 #include <tqptrlist.h>
 #include <tqwhatsthis.h>
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <klibloader.h>
 #include <kurl.h>
 #include <kdebug.h>
diff --git a/parts/filelist/filelist_widget.cpp b/parts/filelist/filelist_widget.cpp
index 4898440d..93769573 100644
--- a/parts/filelist/filelist_widget.cpp
+++ b/parts/filelist/filelist_widget.cpp
@@ -14,7 +14,7 @@
 #include <tqheader.h>
 #include <tqpixmap.h>
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <klibloader.h>
 #include <kurl.h>
 #include <kdebug.h>
diff --git a/parts/filelist/projectviewpart.cpp b/parts/filelist/projectviewpart.cpp
index 45d186ae..62cae2b0 100644
--- a/parts/filelist/projectviewpart.cpp
+++ b/parts/filelist/projectviewpart.cpp
@@ -43,9 +43,9 @@
 #include <kdialogbase.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/encodinginterface.h>
-#include <kparts/part.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/encodinginterface.h>
+#include <tdeparts/part.h>
 #include <kxmlguibuilder.h>
 #include <kdebug.h>
 #include <kconfig.h>
diff --git a/parts/fileselector/fileselector_widget.cpp b/parts/fileselector/fileselector_widget.cpp
index d2d8ffff..cfa72b6c 100644
--- a/parts/fileselector/fileselector_widget.cpp
+++ b/parts/fileselector/fileselector_widget.cpp
@@ -48,7 +48,7 @@
 #include <tqdockarea.h>
 #include <tqtimer.h>
 
-#include <ktexteditor/document.h>
+#include <tdetexteditor/document.h>
 
 #include <kmainwindow.h>
 #include <kapplication.h>
diff --git a/parts/filter/filterpart.cpp b/parts/filter/filterpart.cpp
index 496dc197..aa10c559 100644
--- a/parts/filter/filterpart.cpp
+++ b/parts/filter/filterpart.cpp
@@ -14,10 +14,10 @@
 #include <kaction.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kparts/part.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/selectioninterface.h>
-#include <ktexteditor/viewcursorinterface.h>
+#include <tdeparts/part.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/selectioninterface.h>
+#include <tdetexteditor/viewcursorinterface.h>
 
 #include "kdevcore.h"
 #include "kdevpartcontroller.h"
diff --git a/parts/grepview/grepdlg.cpp b/parts/grepview/grepdlg.cpp
index bc6948fd..e792b04b 100644
--- a/parts/grepview/grepdlg.cpp
+++ b/parts/grepview/grepdlg.cpp
@@ -33,7 +33,7 @@
 #include <kurlcompletion.h>
 #include <kurlrequester.h>
 #include <kstdguiitem.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <kdevpartcontroller.h>
 #include <klineedit.h>
 
diff --git a/parts/grepview/grepviewpart.cpp b/parts/grepview/grepviewpart.cpp
index 11ffbd77..7b2822ec 100644
--- a/parts/grepview/grepviewpart.cpp
+++ b/parts/grepview/grepviewpart.cpp
@@ -21,7 +21,7 @@
 #include <kiconloader.h>
 #include <kprocess.h>
 #include <kstringhandler.h>
-#include <ktexteditor/document.h>
+#include <tdetexteditor/document.h>
 
 #include "kdevcore.h"
 #include "kdevpartcontroller.h"
diff --git a/parts/grepview/grepviewwidget.cpp b/parts/grepview/grepviewwidget.cpp
index 43981f6d..65ddf9e3 100644
--- a/parts/grepview/grepviewwidget.cpp
+++ b/parts/grepview/grepviewwidget.cpp
@@ -17,8 +17,8 @@
 #include <kdialogbase.h>
 #include <klocale.h>
 #include <kprocess.h>
-#include <kparts/part.h>
-#include <ktexteditor/selectioninterface.h>
+#include <tdeparts/part.h>
+#include <tdetexteditor/selectioninterface.h>
 #include <kaction.h>
 #include <kpopupmenu.h>
 #include <ktabwidget.h>
diff --git a/parts/konsole/konsoleviewwidget.cpp b/parts/konsole/konsoleviewwidget.cpp
index 8c9e517b..a9f84bb6 100644
--- a/parts/konsole/konsoleviewwidget.cpp
+++ b/parts/konsole/konsoleviewwidget.cpp
@@ -13,7 +13,7 @@
 #include <tqframe.h>
 #include <tqdir.h>
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <klibloader.h>
 #include <kurl.h>
 #include <kdebug.h>
diff --git a/parts/outputviews/appoutputviewpart.cpp b/parts/outputviews/appoutputviewpart.cpp
index 5bdb2cd9..5e1e92bc 100644
--- a/parts/outputviews/appoutputviewpart.cpp
+++ b/parts/outputviews/appoutputviewpart.cpp
@@ -17,7 +17,7 @@
 #include <klocale.h>
 #include <kaction.h>
 #include <kiconloader.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <kdevgenericfactory.h>
 #include <kdevplugininfo.h>
 #include <kapplication.h>
diff --git a/parts/outputviews/makeactionfilter.cpp b/parts/outputviews/makeactionfilter.cpp
index 5c8e7c6c..a1b1cb70 100644
--- a/parts/outputviews/makeactionfilter.cpp
+++ b/parts/outputviews/makeactionfilter.cpp
@@ -234,7 +234,7 @@ void MakeActionFilter::test()
 		"-fno-builtin -g3 -fno-exceptions -fno-check-new -fno-common    -o libkfilereplacepart.la.closure libkfilereplacepart_la_closure.lo "
 		"-module -no-undefined  -L/usr/X11R6/lib -L/usr/lib/qt3/lib -L/opt/trinity/lib  -version-info 1:0:0 kfilereplacepart.lo kfilereplacedoc.lo "
 		"kfilereplaceview.lo kaboutkfilereplace.lo kaddstringdlg.lo kconfirmdlg.lo kernel.lo kexpression.lo kfilereplacepref.lo "
-		"klistviewstring.lo knewprojectdlg.lo koptionsdlg.lo kresultview.lo filelib.lo knewprojectdlgs.lo -lkio -lkparts -lkhtml",
+		"klistviewstring.lo knewprojectdlg.lo koptionsdlg.lo kresultview.lo filelib.lo knewprojectdlgs.lo -lkio -ltdeparts -ltdehtml",
 		"linking", "libtool", "libkfilereplacepart.la.closure")
 	<< TestItem( //libtool, linking 3
 		"/bin/sh ../libtool --silent --mode=link --tag=CXX g++  -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -pedantic "
@@ -242,7 +242,7 @@ void MakeActionFilter::test()
 		"-fno-builtin -g3 -fno-exceptions -fno-check-new -fno-common    -o libkfilereplacepart.la -rpath /opt/trinity/lib/trinity "
 		"-module -no-undefined  -L/usr/X11R6/lib -L/usr/lib/qt3/lib -L/opt/trinity/lib  -version-info 1:0:0 kfilereplacepart.lo "
 		"kfilereplacedoc.lo kfilereplaceview.lo kaboutkfilereplace.lo kaddstringdlg.lo kconfirmdlg.lo kernel.lo kexpression.lo "
-		"kfilereplacepref.lo klistviewstring.lo knewprojectdlg.lo koptionsdlg.lo kresultview.lo filelib.lo knewprojectdlgs.lo -lkio -lkparts -lkhtml",
+		"kfilereplacepref.lo klistviewstring.lo knewprojectdlg.lo koptionsdlg.lo kresultview.lo filelib.lo knewprojectdlgs.lo -lkio -ltdeparts -ltdehtml",
 		"linking", "libtool", "libkfilereplacepart.la")
 	<< TestItem( //automake, builddir!=srcdir, libtool=no, compiling
 		" g++ -DHAVE_CONFIG_H -I. -I/home/andris/cvs-developement/head/quanta/quanta/project "
diff --git a/parts/outputviews/makeitem.cpp b/parts/outputviews/makeitem.cpp
index e6ae4609..e9d53ab1 100644
--- a/parts/outputviews/makeitem.cpp
+++ b/parts/outputviews/makeitem.cpp
@@ -16,7 +16,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 
-#include "ktexteditor/cursorinterface.h"
+#include "tdetexteditor/cursorinterface.h"
 
 MakeItem::MakeItem()
 {
diff --git a/parts/outputviews/makewidget.cpp b/parts/outputviews/makewidget.cpp
index ad106ef0..07204c8c 100644
--- a/parts/outputviews/makewidget.cpp
+++ b/parts/outputviews/makewidget.cpp
@@ -17,9 +17,9 @@
 #include "processlinemaker.h"
 #include "makeviewpart.h"
 #include "makeitem.h"
-#include "ktexteditor/document.h"
-#include "ktexteditor/cursorinterface.h"
-#include "ktexteditor/editinterface.h"
+#include "tdetexteditor/document.h"
+#include "tdetexteditor/cursorinterface.h"
+#include "tdetexteditor/editinterface.h"
 #include "urlutil.h"
 
 #include <kdebug.h>
diff --git a/parts/quickopen/quickopen_part.cpp b/parts/quickopen/quickopen_part.cpp
index 04f19c8d..cd95f64a 100644
--- a/parts/quickopen/quickopen_part.cpp
+++ b/parts/quickopen/quickopen_part.cpp
@@ -32,8 +32,8 @@
 
 #include <kmainwindow.h>
 
-#include <kparts/part.h>
-#include <ktexteditor/document.h>
+#include <tdeparts/part.h>
+#include <tdetexteditor/document.h>
 
 #include <kdevmainwindow.h>
 #include <kdevcore.h>
diff --git a/parts/regexptest/regexptestdlg.cpp b/parts/regexptest/regexptestdlg.cpp
index ecc201b4..95988bde 100644
--- a/parts/regexptest/regexptestdlg.cpp
+++ b/parts/regexptest/regexptestdlg.cpp
@@ -26,10 +26,10 @@
 #include <kdebug.h>
 #include <kglobalsettings.h>
 #include <klocale.h>
-#include <kparts/part.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/editinterface.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/part.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdeparts/componentfactory.h>
 #include <kregexpeditorinterface.h>
 
 #include "kdevplugin.h"
diff --git a/parts/replace/replace_widget.cpp b/parts/replace/replace_widget.cpp
index b24949ab..a677b292 100644
--- a/parts/replace/replace_widget.cpp
+++ b/parts/replace/replace_widget.cpp
@@ -13,19 +13,19 @@
 
 #include <dcopclient.h>
 #include <kapplication.h>
-#include <kparts/part.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/part.h>
+#include <tdeparts/componentfactory.h>
 #include <klibloader.h>
 #include <ktrader.h>
 #include <kurl.h>
 #include <kurlrequester.h>
 #include <klineedit.h>
 #include <kdebug.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/editor.h>
-#include <ktexteditor/document.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/selectioninterface.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/editor.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/selectioninterface.h>
 #include <kdevpartcontroller.h>
 #include <kdevcore.h>
 #include <kdevmainwindow.h>
diff --git a/parts/replace/replace_widget.h b/parts/replace/replace_widget.h
index 227f8775..c9063928 100644
--- a/parts/replace/replace_widget.h
+++ b/parts/replace/replace_widget.h
@@ -12,7 +12,7 @@
 #ifndef __REPLACE_WIDGET_H__
 #define __REPLACE_WIDGET_H__
 
-#include <ktexteditor/editinterface.h>
+#include <tdetexteditor/editinterface.h>
 
 #include <tqwidget.h>
 #include <tqstring.h>
diff --git a/parts/replace/replacedlgimpl.cpp b/parts/replace/replacedlgimpl.cpp
index 0ee78577..87432791 100644
--- a/parts/replace/replacedlgimpl.cpp
+++ b/parts/replace/replacedlgimpl.cpp
@@ -5,7 +5,7 @@
 #include <tqlabel.h>
 
 #include <ktrader.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <kregexpeditorinterface.h>
 #include <kurlrequester.h>
 #include <kurlcompletion.h>
diff --git a/parts/scripting/scriptingpart.cpp b/parts/scripting/scriptingpart.cpp
index f12625f8..35b0f9b0 100644
--- a/parts/scripting/scriptingpart.cpp
+++ b/parts/scripting/scriptingpart.cpp
@@ -38,7 +38,7 @@
 #include <kapplication.h>
 #include <kconfig.h>
 #include "scriptingglobalconfig.h"
-#include "kscriptactionmanager.h"
+#include "tdescriptactionmanager.h"
 
 typedef KDevGenericFactory<scriptingPart> scriptingFactory;
 KDevPluginInfo data("kdevscripting");
diff --git a/parts/snippet/snippet_widget.cpp b/parts/snippet/snippet_widget.cpp
index 1cf8a398..8e54fd75 100644
--- a/parts/snippet/snippet_widget.cpp
+++ b/parts/snippet/snippet_widget.cpp
@@ -6,7 +6,7 @@
  *  Copyright: See COPYING file that comes with this distribution
  */
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <klibloader.h>
 #include <kurl.h>
 #include <kdebug.h>
@@ -19,10 +19,10 @@
 #include <ktextedit.h>
 #include <kmessagebox.h>
 #include <tqsplitter.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/editor.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/document.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/editor.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/document.h>
 #include <kconfig.h>
 #include <tqtooltip.h>
 #include <kpopupmenu.h>
diff --git a/parts/snippet/snippet_widget.h b/parts/snippet/snippet_widget.h
index 1a0ef8c1..29bb1dc9 100644
--- a/parts/snippet/snippet_widget.h
+++ b/parts/snippet/snippet_widget.h
@@ -15,8 +15,8 @@
 #include <tqtooltip.h>
 #include <tqrect.h>
 
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/view.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/view.h>
 #include "snippetconfig.h"
 
 class KDevProject;
diff --git a/parts/texttools/texttoolspart.cpp b/parts/texttools/texttoolspart.cpp
index deb88ff3..0450782f 100644
--- a/parts/texttools/texttoolspart.cpp
+++ b/parts/texttools/texttoolspart.cpp
@@ -16,7 +16,7 @@
 #include <klocale.h>
 #include <kdevgenericfactory.h>
 #include <kdevplugininfo.h>
-#include <ktexteditor/editinterface.h>
+#include <tdetexteditor/editinterface.h>
 
 #include "kdevpartcontroller.h"
 #include "kdevmainwindow.h"
diff --git a/parts/texttools/texttoolspart.h b/parts/texttools/texttoolspart.h
index 46f9b7cc..5ebee704 100644
--- a/parts/texttools/texttoolspart.h
+++ b/parts/texttools/texttoolspart.h
@@ -13,7 +13,7 @@
 #define _TEXTTOOLSPART_H_
 
 #include <tqguardedptr.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include "kdevplugin.h"
 
 class TextToolsWidget;
diff --git a/parts/texttools/texttoolswidget.cpp b/parts/texttools/texttoolswidget.cpp
index a358fb07..f655511f 100644
--- a/parts/texttools/texttoolswidget.cpp
+++ b/parts/texttools/texttoolswidget.cpp
@@ -16,11 +16,11 @@
 #include <tqtimer.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <kpopupmenu.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/selectioninterface.h>
-#include <ktexteditor/editinterface.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/selectioninterface.h>
+#include <tdetexteditor/editinterface.h>
 
 #include "kdevmainwindow.h"
 #include "kdevpartcontroller.h"
diff --git a/parts/tools/kapplicationtree.cpp b/parts/tools/kapplicationtree.cpp
index edf89043..287e5b40 100644
--- a/parts/tools/kapplicationtree.cpp
+++ b/parts/tools/kapplicationtree.cpp
@@ -53,7 +53,7 @@
 #include <kmimetype.h>
 #include <kservicegroup.h>
 #include <klistview.h>
-#include <ksycoca.h>
+#include <tdesycoca.h>
 #include <kdebug.h>
 
 #include "kapplicationtree.h"
diff --git a/parts/tools/tools_part.cpp b/parts/tools/tools_part.cpp
index b414fbbb..b35ac551 100644
--- a/parts/tools/tools_part.cpp
+++ b/parts/tools/tools_part.cpp
@@ -15,9 +15,9 @@
 #include <kdialogbase.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <kprocess.h>
-#include <ktexteditor/document.h>
+#include <tdetexteditor/document.h>
 
 #include "kdevcore.h"
 #include "kdevproject.h"
diff --git a/parts/valgrind/valgrind_widget.cpp b/parts/valgrind/valgrind_widget.cpp
index 074a2c38..e3d36291 100644
--- a/parts/valgrind/valgrind_widget.cpp
+++ b/parts/valgrind/valgrind_widget.cpp
@@ -2,7 +2,7 @@
 #include <tqpainter.h>
 #include <tqpopupmenu.h>
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <klibloader.h>
 #include <kurl.h>
 #include <kdebug.h>