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

37 files changed, 56 insertions, 56 deletions

diff --git a/buildtools/ada/adaglobaloptionsdlg.cpp b/buildtools/ada/adaglobaloptionsdlg.cpp
index 33e432cf..a39c9c3f 100644
--- a/buildtools/ada/adaglobaloptionsdlg.cpp
+++ b/buildtools/ada/adaglobaloptionsdlg.cpp
@@ -13,7 +13,7 @@
 
 #include <kurlrequester.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "kdevcompileroptions.h"
 
diff --git a/buildtools/ada/adaproject_part.cpp b/buildtools/ada/adaproject_part.cpp
index 96b01a51..e402d9a1 100644
--- a/buildtools/ada/adaproject_part.cpp
+++ b/buildtools/ada/adaproject_part.cpp
@@ -25,7 +25,7 @@
 #include <klibloader.h>
 #include <kprocess.h>
 #include <kservice.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "domutil.h"
 #include "kdevcore.h"
diff --git a/buildtools/autotools/CMakeLists.txt b/buildtools/autotools/CMakeLists.txt
index d4e68654..f7af5bc6 100644
--- a/buildtools/autotools/CMakeLists.txt
+++ b/buildtools/autotools/CMakeLists.txt
@@ -50,7 +50,7 @@ tde_add_kpart( libkdevautoproject AUTOMOC
     addfiledlgbase.ui addfiledlg.cpp removefiledlgbase.ui
     removefiledlg.cpp addicondlgbase.ui addicondlg.cpp
     addtranslationdlg.cpp addprefixdlg.cpp
-    kfilednddetailview.cpp kfiledndiconview.cpp
+    tdefilednddetailview.cpp tdefiledndiconview.cpp
     fileselectorwidget.cpp misc.cpp addsubprojectdlgbase.ui
     removetargetdlg.cpp removetargetdlgbase.ui
     choosetargetdialog.cpp choosetargetdlgbase.ui
diff --git a/buildtools/autotools/Makefile.am b/buildtools/autotools/Makefile.am
index 8a21dc09..76bbffec 100644
--- a/buildtools/autotools/Makefile.am
+++ b/buildtools/autotools/Makefile.am
@@ -20,7 +20,7 @@ libkdevautoproject_la_SOURCES = autoprojectpart.cpp autoprojectwidget.cpp \
 			addservicedlgbase.ui addapplicationdlg.cpp addapplicationdlgbase.ui addtargetdlg.cpp \
 			addtargetdlgbase.ui addsubprojectdlg.cpp addfiledlgbase.ui addfiledlg.cpp \
 			removefiledlgbase.ui removefiledlg.cpp addicondlgbase.ui addicondlg.cpp \
-			addtranslationdlg.cpp addprefixdlg.cpp kfilednddetailview.cpp kfiledndiconview.cpp \
+			addtranslationdlg.cpp addprefixdlg.cpp tdefilednddetailview.cpp tdefiledndiconview.cpp \
 			fileselectorwidget.cpp misc.cpp addsubprojectdlgbase.ui removetargetdlg.cpp \
 			removetargetdlgbase.ui choosetargetdialog.cpp choosetargetdlgbase.ui addexistingdlgbase.ui \
 			addexistingfilesdlg.cpp addexistingdirectoriesdlg.cpp kimporticonview.cpp \
diff --git a/buildtools/autotools/addexistingdirectoriesdlg.cpp b/buildtools/autotools/addexistingdirectoriesdlg.cpp
index 181f7c5b..d9168924 100644
--- a/buildtools/autotools/addexistingdirectoriesdlg.cpp
+++ b/buildtools/autotools/addexistingdirectoriesdlg.cpp
@@ -19,7 +19,7 @@
 
 #include <kprogress.h>
 #include <klocale.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kprocess.h>
 
 #include "autolistviewitems.h"
diff --git a/buildtools/autotools/addexistingdirectoriesdlg.h b/buildtools/autotools/addexistingdirectoriesdlg.h
index d09d53db..7b1d9c8e 100644
--- a/buildtools/autotools/addexistingdirectoriesdlg.h
+++ b/buildtools/autotools/addexistingdirectoriesdlg.h
@@ -20,7 +20,7 @@
 #include "addexistingdlgbase.h"
 
 #include <tqdialog.h>
-#include <kfile.h>
+#include <tdefile.h>
 
 #include "misc.h"
 #include "fileselectorwidget.h"
diff --git a/buildtools/autotools/addexistingfilesdlg.cpp b/buildtools/autotools/addexistingfilesdlg.cpp
index b17eb118..0c3796d9 100644
--- a/buildtools/autotools/addexistingfilesdlg.cpp
+++ b/buildtools/autotools/addexistingfilesdlg.cpp
@@ -27,7 +27,7 @@
 #include <tqpixmap.h>
 
 #include <kdebug.h>
-#include <kfileview.h>
+#include <tdefileview.h>
 #include <kguiitem.h>
 #include <kprogress.h>
 #include <kprocess.h>
diff --git a/buildtools/autotools/addexistingfilesdlg.h b/buildtools/autotools/addexistingfilesdlg.h
index ea556226..2b44bba1 100644
--- a/buildtools/autotools/addexistingfilesdlg.h
+++ b/buildtools/autotools/addexistingfilesdlg.h
@@ -21,7 +21,7 @@
 #define ADDEXISTINGFILESDLG_H
 
 #include <tqdialog.h>
-#include <kfile.h>
+#include <tdefile.h>
 
 #include "addexistingdlgbase.h"
 #include "fileselectorwidget.h"
diff --git a/buildtools/autotools/addprefixdlg.cpp b/buildtools/autotools/addprefixdlg.cpp
index 06aab18b..f37b6626 100644
--- a/buildtools/autotools/addprefixdlg.cpp
+++ b/buildtools/autotools/addprefixdlg.cpp
@@ -15,7 +15,7 @@
 #include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <kbuttonbox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <kstdguiitem.h>
 #include <tdeversion.h>
diff --git a/buildtools/autotools/addsubprojectdlg.cpp b/buildtools/autotools/addsubprojectdlg.cpp
index ea3d2b7a..373a3861 100644
--- a/buildtools/autotools/addsubprojectdlg.cpp
+++ b/buildtools/autotools/addsubprojectdlg.cpp
@@ -18,7 +18,7 @@
 #include <tqtextstream.h>
 #include <kbuttonbox.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <klineedit.h>
 #include <kmessagebox.h>
diff --git a/buildtools/autotools/autoprojectpart.cpp b/buildtools/autotools/autoprojectpart.cpp
index 0e665eb7..801d5234 100644
--- a/buildtools/autotools/autoprojectpart.cpp
+++ b/buildtools/autotools/autoprojectpart.cpp
@@ -32,7 +32,7 @@
 
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kaction.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
diff --git a/buildtools/autotools/autoprojectwidget.cpp b/buildtools/autotools/autoprojectwidget.cpp
index 7ffa0ef0..6ac797b9 100644
--- a/buildtools/autotools/autoprojectwidget.cpp
+++ b/buildtools/autotools/autoprojectwidget.cpp
@@ -33,12 +33,12 @@
 #include <tqtimer.h>
 
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klistview.h>
 #include <kmessagebox.h>
 #include <kregexp.h>
 #include <kurl.h>
-#include <kfile.h>
+#include <tdefile.h>
 #include <kxmlguiclient.h>
 #include <kaction.h>
 
diff --git a/buildtools/autotools/configureoptionswidget.cpp b/buildtools/autotools/configureoptionswidget.cpp
index 5ff3e67e..e65d4a35 100644
--- a/buildtools/autotools/configureoptionswidget.cpp
+++ b/buildtools/autotools/configureoptionswidget.cpp
@@ -22,7 +22,7 @@
 #include <tqvalidator.h>
 #include <klineedit.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klibloader.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/buildtools/autotools/fileselectorwidget.cpp b/buildtools/autotools/fileselectorwidget.cpp
index 2235f357..842358e4 100644
--- a/buildtools/autotools/fileselectorwidget.cpp
+++ b/buildtools/autotools/fileselectorwidget.cpp
@@ -27,7 +27,7 @@
 #include <kurlcombobox.h>
 #include <kurlcompletion.h>
 #include <kprotocolinfo.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kcombobox.h>
 
@@ -36,17 +36,17 @@
 #include "fileselectorwidget.h"
 #include <kdiroperator.h>
 #include <kcombiview.h>
-#include <kfilepreview.h>
-#include <kfileview.h>
-#include <kfileitem.h>
+#include <tdefilepreview.h>
+#include <tdefileview.h>
+#include <tdefileitem.h>
 #include <kimagefilepreview.h>
 
 #include "autoprojectwidget.h"
 #include "autoprojectpart.h"
 #include "kdevlanguagesupport.h"
 
-#include "kfilednddetailview.h"
-#include "kfiledndiconview.h"
+#include "tdefilednddetailview.h"
+#include "tdefiledndiconview.h"
 
 KDnDDirOperator::KDnDDirOperator ( const KURL &urlName, TQWidget* parent, const char* name ) : KDirOperator ( urlName, parent, name )
 {
diff --git a/buildtools/autotools/fileselectorwidget.h b/buildtools/autotools/fileselectorwidget.h
index 09d589de..a9b7abd7 100644
--- a/buildtools/autotools/fileselectorwidget.h
+++ b/buildtools/autotools/fileselectorwidget.h
@@ -22,14 +22,14 @@
 #include <klistview.h>
 #include <tqvbox.h>
 #include <tqwidget.h>
-#include <kfile.h>
+#include <tdefile.h>
 #include <kurlcombobox.h>
 #include <kurlcompletion.h>
 #include <kcombobox.h>
 #include <kprotocolinfo.h>
 
-#include <kfileview.h>
-#include <kfileitem.h>
+#include <tdefileview.h>
+#include <tdefileitem.h>
 
 #include <kdiroperator.h>
 
diff --git a/buildtools/autotools/kimporticonview.h b/buildtools/autotools/kimporticonview.h
index 430f430c..d66c74ba 100644
--- a/buildtools/autotools/kimporticonview.h
+++ b/buildtools/autotools/kimporticonview.h
@@ -19,7 +19,7 @@
 
 #include <tqwidget.h>
 
-#include "kfiledndiconview.h"
+#include "tdefiledndiconview.h"
 
 class KImportIconView : public KFileDnDIconView
 {
diff --git a/buildtools/autotools/subprojectoptionsdlg.cpp b/buildtools/autotools/subprojectoptionsdlg.cpp
index aabb4b5e..f25a3958 100644
--- a/buildtools/autotools/subprojectoptionsdlg.cpp
+++ b/buildtools/autotools/subprojectoptionsdlg.cpp
@@ -30,7 +30,7 @@
 #include <kurlrequesterdlg.h>
 #include <kurlrequester.h>
 #include <kurlcompletion.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include "domutil.h"
 #include "misc.h"
 #include "addprefixdlg.h"
diff --git a/buildtools/autotools/targetoptionsdlg.cpp b/buildtools/autotools/targetoptionsdlg.cpp
index f462ee60..bc81ef30 100644
--- a/buildtools/autotools/targetoptionsdlg.cpp
+++ b/buildtools/autotools/targetoptionsdlg.cpp
@@ -25,7 +25,7 @@
 #include <kurlcompletion.h>
 #include <klocale.h>
 #include <knotifyclient.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include "autolistviewitems.h"
 
 #include "misc.h"
diff --git a/buildtools/autotools/kfilednddetailview.cpp b/buildtools/autotools/tdefilednddetailview.cpp
index 405ff249..74492577 100644
--- a/buildtools/autotools/kfilednddetailview.cpp
+++ b/buildtools/autotools/tdefilednddetailview.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-*                        kfilednddetailview.cpp  -  description
+*                        tdefilednddetailview.cpp  -  description
 *                           -------------------
 *  begin                : Wed Nov 1 2000
 *  copyright            : (C) 2000 by Bj�n Sahlstr�
@@ -21,12 +21,12 @@
 #include <tqapplication.h>
 //////////////////////////////////////////////////////
 // KDE specific includes
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 //////////////////////////////////////////////////////
 // Application specific includes
-#include "kfilednddetailview.h"
+#include "tdefilednddetailview.h"
 
 #ifndef AUTO_OPEN_TIME
 #define AUTO_OPEN_TIME
@@ -208,5 +208,5 @@ void KFileDnDDetailView::setDnDEnabled( bool useDnD ){
 }
 //-----------------------------------------------
 #ifndef NO_INCLUDE_MOCFILES
-#include "kfilednddetailview.moc"
+#include "tdefilednddetailview.moc"
 #endif
diff --git a/buildtools/autotools/kfilednddetailview.h b/buildtools/autotools/tdefilednddetailview.h
index a6dd87c0..95f7d663 100644
--- a/buildtools/autotools/kfilednddetailview.h
+++ b/buildtools/autotools/tdefilednddetailview.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-*                        kfilednddetailview.h  -  description
+*                        tdefilednddetailview.h  -  description
 *                           -------------------
 *  begin                : Wed Nov 1 2000
 *  copyright            : (C) 2000 by Björn Sahlström
@@ -24,7 +24,7 @@
 #include <tqtimer.h> 
 //////////////////////////////////////////////////////////////////////
 // KDE specific include files
-#include <kfiledetailview.h>
+#include <tdefiledetailview.h>
 #include <kurldrag.h>
 
 
diff --git a/buildtools/autotools/kfiledndiconview.cpp b/buildtools/autotools/tdefiledndiconview.cpp
index e7b727e5..d192b3b0 100644
--- a/buildtools/autotools/kfiledndiconview.cpp
+++ b/buildtools/autotools/tdefiledndiconview.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-*                        kfiledndiconview.cpp  -  description
+*                        tdefiledndiconview.cpp  -  description
 *                           -------------------
 *  begin                : Wed Nov 1 2000
 *  copyright            : (C) 2000 by Bj�rn Sahlstr�m
@@ -21,12 +21,12 @@
 #include <tqapplication.h>
 //////////////////////////////////////////////////////
 // KDE specific includes
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 //////////////////////////////////////////////////////
 // Application specific includes
-#include "kfiledndiconview.h"
+#include "tdefiledndiconview.h"
 
 #ifndef AUTO_OPEN_TIME
 #define AUTO_OPEN_TIME
@@ -190,5 +190,5 @@ bool KFileDnDIconView::acceptDrag(TQDropEvent* e ) const {
 }
 //-----------------------------------------------
 #ifndef NO_INCLUDE_MOCFILES
-#include "kfiledndiconview.moc"
+#include "tdefiledndiconview.moc"
 #endif
diff --git a/buildtools/autotools/kfiledndiconview.h b/buildtools/autotools/tdefiledndiconview.h
index 0e45d174..84148362 100644
--- a/buildtools/autotools/kfiledndiconview.h
+++ b/buildtools/autotools/tdefiledndiconview.h
@@ -1,5 +1,5 @@
 /**************************************************************************
-*                        kfiledndiconview.h  -  description
+*                        tdefiledndiconview.h  -  description
 *                          -------------------
 *  begin                : Wed Nov 1 2000
 *  copyright            : (C) 2000 by Björn Sahlström
@@ -20,7 +20,7 @@
 
 #include <tqwidget.h>
 #include <tqtimer.h> 
-#include <kfileiconview.h>
+#include <tdefileiconview.h>
 #include <kurldrag.h>
 
 /**
diff --git a/buildtools/custommakefiles/custombuildoptionswidget.cpp b/buildtools/custommakefiles/custombuildoptionswidget.cpp
index 920a0908..31f3161f 100644
--- a/buildtools/custommakefiles/custombuildoptionswidget.cpp
+++ b/buildtools/custommakefiles/custombuildoptionswidget.cpp
@@ -15,7 +15,7 @@
 #include <klineedit.h>
 #include <kurlrequester.h>
 #include <kurlcompletion.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tqradiobutton.h>
 #include <tqtabwidget.h>
 #include "domutil.h"
diff --git a/buildtools/custommakefiles/custommanagerwidget.cpp b/buildtools/custommakefiles/custommanagerwidget.cpp
index 7062ab18..6c09541b 100644
--- a/buildtools/custommakefiles/custommanagerwidget.cpp
+++ b/buildtools/custommakefiles/custommanagerwidget.cpp
@@ -20,7 +20,7 @@
 #include <ktextedit.h>
 #include <kurlrequester.h>
 #include <kurlcompletion.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <keditlistbox.h>
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/buildtools/custommakefiles/customprojectpart.cpp b/buildtools/custommakefiles/customprojectpart.cpp
index b39dc00f..6e5bc476 100644
--- a/buildtools/custommakefiles/customprojectpart.cpp
+++ b/buildtools/custommakefiles/customprojectpart.cpp
@@ -27,7 +27,7 @@
 #include <tqdom.h>
 
 #include <kaction.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <keditlistbox.h>
diff --git a/buildtools/lib/parsers/autotools/autotoolsdriver.cpp b/buildtools/lib/parsers/autotools/autotoolsdriver.cpp
index a9620598..c31a5574 100644
--- a/buildtools/lib/parsers/autotools/autotoolsdriver.cpp
+++ b/buildtools/lib/parsers/autotools/autotoolsdriver.cpp
@@ -25,7 +25,7 @@
 
 #include <stdio.h>
 #include <tqvaluestack.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 extern FILE *yyin, *yyout;
 extern int yyparse();
diff --git a/buildtools/lib/parsers/qmake/CMakeLists.txt b/buildtools/lib/parsers/qmake/CMakeLists.txt
index 73296c7b..b8328a84 100644
--- a/buildtools/lib/parsers/qmake/CMakeLists.txt
+++ b/buildtools/lib/parsers/qmake/CMakeLists.txt
@@ -34,6 +34,6 @@ tde_add_library( kdevqmakeparser SHARED
     qmake_lex.cpp qmake_yacc.cpp qmakeast.cpp
     qmakeastvisitor.cpp qmakedriver.cpp
   VERSION 0.0.0
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/buildtools/lib/parsers/qmake/qmakedriver.cpp b/buildtools/lib/parsers/qmake/qmakedriver.cpp
index e5a8f994..8b73814d 100644
--- a/buildtools/lib/parsers/qmake/qmakedriver.cpp
+++ b/buildtools/lib/parsers/qmake/qmakedriver.cpp
@@ -21,7 +21,7 @@
 #include "qmakeast.h"
 
 #include <tqvaluestack.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include <iostream>
 #include <fstream>
diff --git a/buildtools/lib/widgets/addfilesdialog.h b/buildtools/lib/widgets/addfilesdialog.h
index edc5c7be..8a7ed5c9 100644
--- a/buildtools/lib/widgets/addfilesdialog.h
+++ b/buildtools/lib/widgets/addfilesdialog.h
@@ -20,7 +20,7 @@
 #define ADDFILESDIALOG_H
 
 #include <tdeversion.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 class TQComboBox;
 
diff --git a/buildtools/lib/widgets/runoptionswidget.cpp b/buildtools/lib/widgets/runoptionswidget.cpp
index 0985e037..079f436e 100644
--- a/buildtools/lib/widgets/runoptionswidget.cpp
+++ b/buildtools/lib/widgets/runoptionswidget.cpp
@@ -20,7 +20,7 @@
 #include "runoptionswidget.h"
 
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurlrequester.h>
 #include <kurlcompletion.h>
 #include <klineedit.h>
diff --git a/buildtools/pascal/pascalglobaloptionsdlg.cpp b/buildtools/pascal/pascalglobaloptionsdlg.cpp
index 62facc8d..cf9e42cf 100644
--- a/buildtools/pascal/pascalglobaloptionsdlg.cpp
+++ b/buildtools/pascal/pascalglobaloptionsdlg.cpp
@@ -15,7 +15,7 @@
 
 #include <kurlrequester.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "kdevcompileroptions.h"
 
diff --git a/buildtools/pascal/pascalproject_part.cpp b/buildtools/pascal/pascalproject_part.cpp
index a2cb5723..4dd34709 100644
--- a/buildtools/pascal/pascalproject_part.cpp
+++ b/buildtools/pascal/pascalproject_part.cpp
@@ -27,7 +27,7 @@
 #include <kmessagebox.h>
 #include <klibloader.h>
 #include <kservice.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tdeversion.h>
 #include <kprocess.h>
 
diff --git a/buildtools/qmake/createscopedlg.cpp b/buildtools/qmake/createscopedlg.cpp
index 4f65dd17..267bd471 100644
--- a/buildtools/qmake/createscopedlg.cpp
+++ b/buildtools/qmake/createscopedlg.cpp
@@ -14,11 +14,11 @@
 #include <klineedit.h>
 #include <kurlrequester.h>
 #include <tqcheckbox.h>
-#include <kfile.h>
+#include <tdefile.h>
 #include <kcombobox.h>
 #include <kmessagebox.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurlcompletion.h>
 
 #include "urlutil.h"
diff --git a/buildtools/qmake/newwidgetdlg.cpp b/buildtools/qmake/newwidgetdlg.cpp
index ab3e72f7..99d39a93 100644
--- a/buildtools/qmake/newwidgetdlg.cpp
+++ b/buildtools/qmake/newwidgetdlg.cpp
@@ -14,7 +14,7 @@
 #include <tqstringlist.h>
 #include <tqcheckbox.h>
 #include <tqmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klineedit.h>
 #include <kpushbutton.h>
 #include <domutil.h>
diff --git a/buildtools/qmake/projectconfigurationdlg.cpp b/buildtools/qmake/projectconfigurationdlg.cpp
index e5e80b2e..8f4ffc70 100644
--- a/buildtools/qmake/projectconfigurationdlg.cpp
+++ b/buildtools/qmake/projectconfigurationdlg.cpp
@@ -20,7 +20,7 @@
 #include <tqbuttongroup.h>
 #include <tqcheckbox.h>
 #include <tqmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <knotifyclient.h>
 #include <klineedit.h>
 #include <kinputdialog.h>
diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp
index 58c4ba22..69c030b7 100644
--- a/buildtools/qmake/trollprojectpart.cpp
+++ b/buildtools/qmake/trollprojectpart.cpp
@@ -31,12 +31,12 @@
 #include <kaction.h>
 #include <tdeparts/part.h>
 #include <kprocess.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <kurlrequesterdlg.h>
 #include <kurlrequester.h>
 #include <kurlcompletion.h>
-#include <kfile.h>
+#include <tdefile.h>
 #include <makeoptionswidget.h>
 
 
diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp
index 5b1f528b..77301f95 100644
--- a/buildtools/qmake/trollprojectwidget.cpp
+++ b/buildtools/qmake/trollprojectwidget.cpp
@@ -39,7 +39,7 @@
 #include <tqinputdialog.h>
 #include <tqwhatsthis.h>
 #include <tqvaluestack.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tqtooltip.h>
 #include <kdebug.h>
 #include <klistview.h>
@@ -57,7 +57,7 @@
 #include <kdirwatch.h>
 #include <kurlrequesterdlg.h>
 #include <kurlrequester.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kurlcompletion.h>
 
 #include "kdevcore.h"