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

65 files changed, 88 insertions, 88 deletions

diff --git a/quanta/components/csseditor/colorrequester.cpp b/quanta/components/csseditor/colorrequester.cpp
index 7538ebe9..be7aba50 100644
--- a/quanta/components/csseditor/colorrequester.cpp
+++ b/quanta/components/csseditor/colorrequester.cpp
@@ -55,7 +55,7 @@ void colorRequester::init()
      if ( !d->edit )
      d->edit = new KLineEdit( this, "line edit" );
 
-     myButton = new KPushButton( this, "kfile button");
+     myButton = new KPushButton( this, "tdefile button");
      TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("colorize"));
      TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal );
      myButton->setIconSet( iconSet );
diff --git a/quanta/components/csseditor/csseditor.cpp b/quanta/components/csseditor/csseditor.cpp
index d3586f57..a157adae 100644
--- a/quanta/components/csseditor/csseditor.cpp
+++ b/quanta/components/csseditor/csseditor.cpp
@@ -31,7 +31,7 @@
 #include <kstandarddirs.h>
 #include <klineedit.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tdeparts/browserextension.h>
 
 #include "propertysetter.h"
diff --git a/quanta/components/csseditor/cssselector.cpp b/quanta/components/csseditor/cssselector.cpp
index 7e61cf02..b1da7961 100644
--- a/quanta/components/csseditor/cssselector.cpp
+++ b/quanta/components/csseditor/cssselector.cpp
@@ -34,7 +34,7 @@
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <kurlrequester.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include "project.h"
 #include "stylesheetparser.h"
 
diff --git a/quanta/components/csseditor/tlpeditors.cpp b/quanta/components/csseditor/tlpeditors.cpp
index 994876a3..ab70afd6 100644
--- a/quanta/components/csseditor/tlpeditors.cpp
+++ b/quanta/components/csseditor/tlpeditors.cpp
@@ -26,7 +26,7 @@
 #include <kdialog.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kimagefilepreview.h>
 
 #include "qextfileinfo.h"
diff --git a/quanta/components/debugger/dbgp/CMakeLists.txt b/quanta/components/debugger/dbgp/CMakeLists.txt
index 868fc177..0652c64d 100644
--- a/quanta/components/debugger/dbgp/CMakeLists.txt
+++ b/quanta/components/debugger/dbgp/CMakeLists.txt
@@ -34,6 +34,6 @@ tde_add_kpart( quantadebuggerdbgp AUTOMOC
     quantadebuggerdbgp.cpp dbgpsettingss.ui
     dbgpsettings.cpp dbgpnetwork.cpp
     qbytearrayfifo.cpp
-  LINK debuggerinterface-static kio-shared
+  LINK debuggerinterface-static tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/quanta/components/framewizard/fmfpeditor.cpp b/quanta/components/framewizard/fmfpeditor.cpp
index e2bfb44a..a191cd19 100644
--- a/quanta/components/framewizard/fmfpeditor.cpp
+++ b/quanta/components/framewizard/fmfpeditor.cpp
@@ -22,7 +22,7 @@
 #include <tqregexp.h>
 #include <kurlrequester.h>
 #include <tqstringlist.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 //#include <kpreviewwidgetbase.h> 
 
diff --git a/quanta/data/config/plugins.rc b/quanta/data/config/plugins.rc
index 1a5a5c24..d8035b9e 100644
--- a/quanta/data/config/plugins.rc
+++ b/quanta/data/config/plugins.rc
@@ -15,8 +15,8 @@ Input=3
 
 [KFileReplace]
 Arguments=
-FileName=trinity/libkfilereplacepart.la
-Icon=kfilereplace
+FileName=trinity/libtdefilereplacepart.la
+Icon=tdefilereplace
 Input=3
 Location=
 OutputWindow=Editor Tab
diff --git a/quanta/data/config/quanta_preview_config.desktop b/quanta/data/config/quanta_preview_config.desktop
index 4000aa18..a3f2e7d7 100644
--- a/quanta/data/config/quanta_preview_config.desktop
+++ b/quanta/data/config/quanta_preview_config.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-Exec=kcmshell --caption %c %i tdehtml_behavior tdehtml_java_js tdehtml_fonts cookies cache proxy kcmcss crypto useragent tdehtml_plugins
+Exec=tdecmshell --caption %c %i tdehtml_behavior tdehtml_java_js tdehtml_fonts cookies cache proxy kcmcss crypto useragent tdehtml_plugins
 Icon=konqueror
 DocPath=konqueror/index.html
 Name=Configure KHTML Browser Part
diff --git a/quanta/data/doc/templates.html b/quanta/data/doc/templates.html
index 3043187e..616dfbdc 100644
--- a/quanta/data/doc/templates.html
+++ b/quanta/data/doc/templates.html
@@ -137,7 +137,7 @@ cool things we took into consideration when using templates in projects.
   the file to the project templates prior to linking. This will prevent broken links on upload.  </li>
   <li>You always have control where you place your templates so you can choose to move them.
   However Quanta does not track this so you will need to change links. This is a good
-  task for kfilereplace which we are setting up to plug in as a kpart.  </li>
+  task for tdefilereplace which we are setting up to plug in as a kpart.  </li>
 </ul>
 </p>
 <p class="minihdr">Templates conclusion
diff --git a/quanta/dialogs/actionconfigdialog.cpp b/quanta/dialogs/actionconfigdialog.cpp
index 7ae6b4a4..9654c046 100644
--- a/quanta/dialogs/actionconfigdialog.cpp
+++ b/quanta/dialogs/actionconfigdialog.cpp
@@ -26,7 +26,7 @@
 
 //kde includes
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kicondialog.h>
 #include <kiconloader.h>
diff --git a/quanta/dialogs/copyto.cpp b/quanta/dialogs/copyto.cpp
index bc2543dc..b5c53356 100644
--- a/quanta/dialogs/copyto.cpp
+++ b/quanta/dialogs/copyto.cpp
@@ -17,8 +17,8 @@
 // qt includes
 
 // kde includes
-#include <kio/job.h>
-#include <kio/netaccess.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
 
 //app includes
 #include "copyto.h"
diff --git a/quanta/dialogs/copyto.h b/quanta/dialogs/copyto.h
index 29412488..3e021e0a 100644
--- a/quanta/dialogs/copyto.h
+++ b/quanta/dialogs/copyto.h
@@ -19,7 +19,7 @@
 #define COPYTO_H
 
 // kde includes
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
 
 
 /**
diff --git a/quanta/dialogs/dirtydlg.cpp b/quanta/dialogs/dirtydlg.cpp
index be6f308a..08ce2883 100644
--- a/quanta/dialogs/dirtydlg.cpp
+++ b/quanta/dialogs/dirtydlg.cpp
@@ -23,10 +23,10 @@
 #include <kdialogbase.h>
 #include <klocale.h>
 #include <kprocess.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
-#include <kio/netaccess.h>
-#include <kfileitem.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/netaccess.h>
+#include <tdefileitem.h>
 
 //app includes
 #include "dirtydialog.h"
diff --git a/quanta/dialogs/dirtydlg.h b/quanta/dialogs/dirtydlg.h
index 4b6d9232..5fd14e36 100644
--- a/quanta/dialogs/dirtydlg.h
+++ b/quanta/dialogs/dirtydlg.h
@@ -18,7 +18,7 @@
 #define DIRTYDLG_H
 
 // kde includes
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
 
 class DirtyDialog;
 class KDialogBase;
diff --git a/quanta/dialogs/dtepeditdlg.cpp b/quanta/dialogs/dtepeditdlg.cpp
index bbb3456d..79247f40 100644
--- a/quanta/dialogs/dtepeditdlg.cpp
+++ b/quanta/dialogs/dtepeditdlg.cpp
@@ -24,8 +24,8 @@
 
 //kde includes
 #include <kcombobox.h>
-#include <kconfig.h>
-#include <kfiledialog.h>
+#include <tdeconfig.h>
+#include <tdefiledialog.h>
 #include <kicondialog.h>
 #include <klistbox.h>
 #include <klineedit.h>
diff --git a/quanta/dialogs/filecombo.cpp b/quanta/dialogs/filecombo.cpp
index 63fd1e58..8f31f692 100644
--- a/quanta/dialogs/filecombo.cpp
+++ b/quanta/dialogs/filecombo.cpp
@@ -22,7 +22,7 @@
 
 // KDE includes
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurl.h>
 
 // app include
diff --git a/quanta/dialogs/settings/parseroptions.cpp b/quanta/dialogs/settings/parseroptions.cpp
index 92ff1206..1f0e8b3c 100644
--- a/quanta/dialogs/settings/parseroptions.cpp
+++ b/quanta/dialogs/settings/parseroptions.cpp
@@ -19,7 +19,7 @@
 #include <tqspinbox.h>
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 /*
  *  Constructs a ParserOptions which is a child of 'parent', with the
diff --git a/quanta/dialogs/tagdialogs/colorcombo.cpp b/quanta/dialogs/tagdialogs/colorcombo.cpp
index 19331def..ebe9a7fd 100644
--- a/quanta/dialogs/tagdialogs/colorcombo.cpp
+++ b/quanta/dialogs/tagdialogs/colorcombo.cpp
@@ -45,7 +45,7 @@
 #include <tqtimer.h>
 
 #include <kcolordialog.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <kiconloader.h>
diff --git a/quanta/dialogs/tagdialogs/tagdialog.cpp b/quanta/dialogs/tagdialogs/tagdialog.cpp
index 90f5f80c..fe466986 100644
--- a/quanta/dialogs/tagdialogs/tagdialog.cpp
+++ b/quanta/dialogs/tagdialogs/tagdialog.cpp
@@ -24,7 +24,7 @@
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <tdetexteditor/viewcursorinterface.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kurl.h>
 #include <kstdguiitem.h>
 #include <kdebug.h>
diff --git a/quanta/dialogs/tagdialogs/tagimgdlg.cpp b/quanta/dialogs/tagdialogs/tagimgdlg.cpp
index d2a680f5..24578a88 100644
--- a/quanta/dialogs/tagdialogs/tagimgdlg.cpp
+++ b/quanta/dialogs/tagdialogs/tagimgdlg.cpp
@@ -22,8 +22,8 @@
 //kde includes
 #include <kapplication.h>
 #include <klocale.h>
-#include <kio/netaccess.h>
-#include <kfiledialog.h>
+#include <tdeio/netaccess.h>
+#include <tdefiledialog.h>
 #include <kurl.h>
 
 //app includes
diff --git a/quanta/messages/annotationoutput.cpp b/quanta/messages/annotationoutput.cpp
index 6888f462..e42eef5d 100644
--- a/quanta/messages/annotationoutput.cpp
+++ b/quanta/messages/annotationoutput.cpp
@@ -21,7 +21,7 @@
 #include <tqtimer.h>
 
 #include <kdebug.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/quanta/messages/messageoutput.cpp b/quanta/messages/messageoutput.cpp
index 2d126794..210ee532 100644
--- a/quanta/messages/messageoutput.cpp
+++ b/quanta/messages/messageoutput.cpp
@@ -18,7 +18,7 @@
 // KDE includes
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kpopupmenu.h>
diff --git a/quanta/parsers/dtd/dtd.cpp b/quanta/parsers/dtd/dtd.cpp
index 34826ca4..19ccc218 100644
--- a/quanta/parsers/dtd/dtd.cpp
+++ b/quanta/parsers/dtd/dtd.cpp
@@ -25,7 +25,7 @@
 #include <klocale.h>
 #include <kurl.h>
 #include <kdebug.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>
 
diff --git a/quanta/parsers/dtd/dtdparser.cpp b/quanta/parsers/dtd/dtdparser.cpp
index 07d571f8..52bd35c8 100644
--- a/quanta/parsers/dtd/dtdparser.cpp
+++ b/quanta/parsers/dtd/dtdparser.cpp
@@ -23,13 +23,13 @@
 #include <tqstring.h>
 
 //kde includes
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kurl.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 //other includes
 #ifdef LIBXML_2_5
diff --git a/quanta/parts/kafka/htmlenhancer.cpp b/quanta/parts/kafka/htmlenhancer.cpp
index 8077a76b..32c58bc1 100644
--- a/quanta/parts/kafka/htmlenhancer.cpp
+++ b/quanta/parts/kafka/htmlenhancer.cpp
@@ -20,7 +20,7 @@
 #include <dom/dom_exception.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "quantacommon.h"
 #include "document.h"
diff --git a/quanta/parts/kafka/kafkasyncoptions.cpp b/quanta/parts/kafka/kafkasyncoptions.cpp
index 2c37f0cd..2e6db3f9 100644
--- a/quanta/parts/kafka/kafkasyncoptions.cpp
+++ b/quanta/parts/kafka/kafkasyncoptions.cpp
@@ -19,7 +19,7 @@
 #include <tqcheckbox.h>
 #include <tqspinbox.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include "kafkasyncoptions.h"
diff --git a/quanta/parts/kafka/undoredo.cpp b/quanta/parts/kafka/undoredo.cpp
index c7345467..a342a23f 100644
--- a/quanta/parts/kafka/undoredo.cpp
+++ b/quanta/parts/kafka/undoredo.cpp
@@ -21,7 +21,7 @@
 #include <tqtabwidget.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <tdetexteditor/editinterface.h>
diff --git a/quanta/parts/preview/whtmlpart.cpp b/quanta/parts/preview/whtmlpart.cpp
index 94552890..bc39e1af 100644
--- a/quanta/parts/preview/whtmlpart.cpp
+++ b/quanta/parts/preview/whtmlpart.cpp
@@ -20,7 +20,7 @@
 #include <tqtextcodec.h>
 
 //kde includes
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <tdehtml_settings.h>
diff --git a/quanta/plugins/quantapluginconfig.cpp b/quanta/plugins/quantapluginconfig.cpp
index 62f25553..02bb3724 100644
--- a/quanta/plugins/quantapluginconfig.cpp
+++ b/quanta/plugins/quantapluginconfig.cpp
@@ -17,7 +17,7 @@
 
 /* KDE INCLUDES */
 #include <kdialogbase.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <kicondialog.h>
diff --git a/quanta/plugins/quantaplugineditor.cpp b/quanta/plugins/quantaplugineditor.cpp
index 347ae9c6..6c8245f3 100644
--- a/quanta/plugins/quantaplugineditor.cpp
+++ b/quanta/plugins/quantaplugineditor.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 /* KDE INCLUDES */
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/quanta/plugins/quantaplugininterface.cpp b/quanta/plugins/quantaplugininterface.cpp
index fc9a8823..51a2cf25 100644
--- a/quanta/plugins/quantaplugininterface.cpp
+++ b/quanta/plugins/quantaplugininterface.cpp
@@ -17,7 +17,7 @@
 
 /* KDE INCLUDES */
 #include <kactioncollection.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kmainwindow.h>
 #include <klocale.h>
diff --git a/quanta/plugins/quantaplugininterface.h b/quanta/plugins/quantaplugininterface.h
index 5e876a5e..28458fad 100644
--- a/quanta/plugins/quantaplugininterface.h
+++ b/quanta/plugins/quantaplugininterface.h
@@ -19,7 +19,7 @@
 #define QUANTAPLUGININTERFACE_H
 
 /* KDE INCLUDES */
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 
 /* QT INCLUDES */
diff --git a/quanta/project/project.cpp b/quanta/project/project.cpp
index 6d5593d8..560b4e7e 100644
--- a/quanta/project/project.cpp
+++ b/quanta/project/project.cpp
@@ -31,7 +31,7 @@
 #include <kapplication.h>
 #include <kcharsets.h>
 #include <kdirwatch.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kmainwindow.h>
diff --git a/quanta/project/projectnewgeneral.cpp b/quanta/project/projectnewgeneral.cpp
index fe6030bb..c60a9ac2 100644
--- a/quanta/project/projectnewgeneral.cpp
+++ b/quanta/project/projectnewgeneral.cpp
@@ -26,7 +26,7 @@
 #include <tqcombobox.h>
 
 // kde includes
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/quanta/project/projectnewlocal.cpp b/quanta/project/projectnewlocal.cpp
index 97d824f4..b430b43b 100644
--- a/quanta/project/projectnewlocal.cpp
+++ b/quanta/project/projectnewlocal.cpp
@@ -28,7 +28,7 @@
 // kde includes
 #include <klocale.h>
 #include <kiconloader.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kprogress.h>
 #include <kmimetype.h>
 #include <tdeversion.h>
diff --git a/quanta/project/projectnewweb.cpp b/quanta/project/projectnewweb.cpp
index 31d3f620..7d62d276 100644
--- a/quanta/project/projectnewweb.cpp
+++ b/quanta/project/projectnewweb.cpp
@@ -28,7 +28,7 @@
 #include <klocale.h>
 #include <kprocess.h>
 #include <kiconloader.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kmessagebox.h>
 #include <kled.h>
 
diff --git a/quanta/project/projectoptions.ui.h b/quanta/project/projectoptions.ui.h
index 3d0200aa..ef8ab07d 100644
--- a/quanta/project/projectoptions.ui.h
+++ b/quanta/project/projectoptions.ui.h
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 #include <kcombobox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tdeversion.h>
 #include <kmessagebox.h>
 #include <klocale.h>
diff --git a/quanta/project/projectprivate.cpp b/quanta/project/projectprivate.cpp
index c488acc0..305831ab 100644
--- a/quanta/project/projectprivate.cpp
+++ b/quanta/project/projectprivate.cpp
@@ -30,11 +30,11 @@
 #include <kaction.h>
 #include <kapplication.h>
 #include <kcharsets.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdirwatch.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kinputdialog.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kmainwindow.h>
diff --git a/quanta/project/projectupload.cpp b/quanta/project/projectupload.cpp
index 1f389cb4..6d075127 100644
--- a/quanta/project/projectupload.cpp
+++ b/quanta/project/projectupload.cpp
@@ -36,12 +36,12 @@
 //kde includes
 #include <kapplication.h>
 #include <kurl.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kmessagebox.h>
 #include <kprotocolinfo.h>
 #include <kdebug.h>
 #include <kinputdialog.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <klineedit.h>
 #include <kcombobox.h>
diff --git a/quanta/project/projectupload.h b/quanta/project/projectupload.h
index bd341eec..c3071899 100644
--- a/quanta/project/projectupload.h
+++ b/quanta/project/projectupload.h
@@ -25,7 +25,7 @@
 #include <tqptrlist.h>
 #include <tqstringlist.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 /**
   *@author Dmitry Poplavsky & Alexander Yakovlev & Andras Mantia
diff --git a/quanta/project/rescanprj.cpp b/quanta/project/rescanprj.cpp
index 5f5ebc71..e04fd444 100644
--- a/quanta/project/rescanprj.cpp
+++ b/quanta/project/rescanprj.cpp
@@ -25,7 +25,7 @@
 #include <kdebug.h>
 #include <kurl.h>
 #include <klocale.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kglobal.h>
 #include <kprogress.h>
 
diff --git a/quanta/project/rescanprj.h b/quanta/project/rescanprj.h
index da3844ac..5c36efb9 100644
--- a/quanta/project/rescanprj.h
+++ b/quanta/project/rescanprj.h
@@ -19,7 +19,7 @@
 #define RESCANPRJ_H
 
 #include <tqregexp.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 
 #include "rescanprjdir.h"
diff --git a/quanta/quanta.tdevelop b/quanta/quanta.tdevelop
index c5729fab..2a70d8f0 100644
--- a/quanta/quanta.tdevelop
+++ b/quanta/quanta.tdevelop
@@ -88,7 +88,7 @@
         <cppflags/>
         <ldflags/>
         <envvars>
-          <envvar value="kommander klinkstatus kfilereplace kxsldbg kimagemapeditor" name="DO_NOT_COMPILE2" />
+          <envvar value="kommander klinkstatus tdefilereplace kxsldbg kimagemapeditor" name="DO_NOT_COMPILE2" />
         </envvars>
       </default>
       <withkommander>
diff --git a/quanta/src/document.cpp b/quanta/src/document.cpp
index f6531e68..dee83bca 100644
--- a/quanta/src/document.cpp
+++ b/quanta/src/document.cpp
@@ -45,7 +45,7 @@
 #include <kdirwatch.h>
 #include <kdebug.h>
 #include <kprogress.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kstandarddirs.h>
 
 #include <tdetexteditor/document.h>
diff --git a/quanta/src/dtds.cpp b/quanta/src/dtds.cpp
index 9a91f304..642c3da7 100644
--- a/quanta/src/dtds.cpp
+++ b/quanta/src/dtds.cpp
@@ -28,7 +28,7 @@
 // include files for KDE
 #include <kapplication.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kurl.h>
 #include <kurlrequester.h>
@@ -36,7 +36,7 @@
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 
 // application specific includes
diff --git a/quanta/src/kqapp.cpp b/quanta/src/kqapp.cpp
index 33a68e91..53b73ea2 100644
--- a/quanta/src/kqapp.cpp
+++ b/quanta/src/kqapp.cpp
@@ -18,7 +18,7 @@
 
 #include <tqtimer.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <twin.h>
 #include <kcmdlineargs.h>
diff --git a/quanta/src/quanta.cpp b/quanta/src/quanta.cpp
index f604bc43..d0e862ff 100644
--- a/quanta/src/quanta.cpp
+++ b/quanta/src/quanta.cpp
@@ -58,10 +58,10 @@
 #include <kiconloader.h>
 #include <kmessagebox.h>
 #include <kencodingfiledialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmenubar.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tdehtmlview.h>
 #include <kdialogbase.h>
 #include <tdeversion.h>
@@ -107,7 +107,7 @@
 #include <tdetexteditor/view.h>
 #include <tdetexteditor/clipboardinterface.h>
 
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #ifdef ENABLE_CVSSERVICE
 #include "cvsservice.h"
@@ -195,7 +195,7 @@ extern int NN;
 
 const TQString resourceDir = TQString(QUANTA_PACKAGE) + "/";
 
-// from kfiledialog.cpp - avoid qt warning in STDERR (~/.xsessionerrors)
+// from tdefiledialog.cpp - avoid qt warning in STDERR (~/.xsessionerrors)
 static void silenceTQToolBar(TQtMsgType, const char *){}
 
 QuantaApp::QuantaApp(int mdiMode) : DCOPObject("WindowManagerIf"), KMdiMainFrm( 0, "Quanta", (KMdi::MdiMode) mdiMode)
diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp
index 77883967..48f106b0 100644
--- a/quanta/src/quanta_init.cpp
+++ b/quanta/src/quanta_init.cpp
@@ -40,11 +40,11 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
 #include <kmenubar.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tdehtmlview.h>
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
@@ -54,7 +54,7 @@
 #include <kprocess.h>
 #include <kprogress.h>
 #include <ktip.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <ktabwidget.h>
 #include <tdemultitabbar.h>
 #include <tdetexteditor/view.h>
@@ -1412,7 +1412,7 @@ void QuantaInit::checkRuntimeDependencies()
 
 
   dependency.name = i18n("Control Center (tdebase)");
-  dependency.execName = "kcmshell";
+  dependency.execName = "tdecmshell";
   dependency.url = "http://www.kde.org";
   dependency.description = i18n("preview browser configuration");
   dependency.type = Dependency::Executable;
@@ -1427,7 +1427,7 @@ void QuantaInit::checkRuntimeDependencies()
 
   dependency.name = "KFileReplace";
   dependency.execName = "KFileReplace";
-  dependency.url = "http://kfilereplace.tdewebdev.org";
+  dependency.url = "http://tdefilereplace.tdewebdev.org";
   dependency.description = i18n("search and replace in files");
   dependency.type = Dependency::Plugin;
   dependencies.append(dependency);
diff --git a/quanta/src/quantadoc.cpp b/quanta/src/quantadoc.cpp
index 6a05a444..eb463cf6 100644
--- a/quanta/src/quantadoc.cpp
+++ b/quanta/src/quantadoc.cpp
@@ -29,7 +29,7 @@
 // include files for KDE
 #include <klocale.h>
 #include <kaction.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kpopupmenu.h>
 #include <kmessagebox.h>
 #include <kdirwatch.h>
diff --git a/quanta/src/viewmanager.cpp b/quanta/src/viewmanager.cpp
index 644e50a7..7cf9a1ed 100644
--- a/quanta/src/viewmanager.cpp
+++ b/quanta/src/viewmanager.cpp
@@ -28,7 +28,7 @@
 #include <tdetexteditor/popupmenuinterface.h>
 #include <tdetexteditor/editorchooser.h>
 #include <tdetexteditor/markinterface.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 
 //app includes
diff --git a/quanta/treeviews/basetreeview.cpp b/quanta/treeviews/basetreeview.cpp
index 7ff962e1..b2d774fc 100644
--- a/quanta/treeviews/basetreeview.cpp
+++ b/quanta/treeviews/basetreeview.cpp
@@ -41,7 +41,7 @@
 #include <kopenwith.h>
 #include <kmessagebox.h>
 #include <kpropertiesdialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kprogress.h>
 #include <kstandarddirs.h>
 #include <kurldrag.h>
diff --git a/quanta/treeviews/basetreeview.h b/quanta/treeviews/basetreeview.h
index bf7110cf..bef646ae 100644
--- a/quanta/treeviews/basetreeview.h
+++ b/quanta/treeviews/basetreeview.h
@@ -22,9 +22,9 @@
 #include <tqvaluelist.h>
 
 //kde includes
-#include <kfiletreebranch.h>
-#include <kfiletreeview.h>
-#include <kfiletreeviewitem.h>
+#include <tdefiletreebranch.h>
+#include <tdefiletreeview.h>
+#include <tdefiletreeviewitem.h>
 
 // quanta includes
 #include "quantacommon.h"
diff --git a/quanta/treeviews/docfolder.cpp b/quanta/treeviews/docfolder.cpp
index 3e7e8949..3d028451 100644
--- a/quanta/treeviews/docfolder.cpp
+++ b/quanta/treeviews/docfolder.cpp
@@ -20,7 +20,7 @@
 #include <tqpixmap.h>
 
 // KDE includes
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 
diff --git a/quanta/treeviews/docitem.cpp b/quanta/treeviews/docitem.cpp
index f24c3bb9..3fb4ac2f 100644
--- a/quanta/treeviews/docitem.cpp
+++ b/quanta/treeviews/docitem.cpp
@@ -17,7 +17,7 @@
 
 #include <tqstrlist.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "docitem.h"
 
diff --git a/quanta/treeviews/doctreeview.cpp b/quanta/treeviews/doctreeview.cpp
index 31579563..684072a5 100644
--- a/quanta/treeviews/doctreeview.cpp
+++ b/quanta/treeviews/doctreeview.cpp
@@ -22,7 +22,7 @@
 #include <tqdir.h>
 
 // KDE clases
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <klocale.h>
 #include <kpopupmenu.h>
diff --git a/quanta/treeviews/filestreeview.cpp b/quanta/treeviews/filestreeview.cpp
index b9a0ac1d..eee9e6fb 100644
--- a/quanta/treeviews/filestreeview.cpp
+++ b/quanta/treeviews/filestreeview.cpp
@@ -24,7 +24,7 @@
 #include <kopenwith.h>
 #include <kmessagebox.h>
 #include <kpopupmenu.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kprogress.h>
 #include <kurl.h>
 
diff --git a/quanta/treeviews/servertreeview.cpp b/quanta/treeviews/servertreeview.cpp
index 4c9a821f..fa34f582 100644
--- a/quanta/treeviews/servertreeview.cpp
+++ b/quanta/treeviews/servertreeview.cpp
@@ -25,7 +25,7 @@
 #include <kopenwith.h>
 #include <kmessagebox.h>
 #include <kpopupmenu.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kprogress.h>
 #include <kurl.h>
 
diff --git a/quanta/treeviews/structtreeview.cpp b/quanta/treeviews/structtreeview.cpp
index f744e52d..4fa7afa9 100644
--- a/quanta/treeviews/structtreeview.cpp
+++ b/quanta/treeviews/structtreeview.cpp
@@ -32,7 +32,7 @@
 #include <kpopupmenu.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdetexteditor/view.h>
 
diff --git a/quanta/treeviews/templatestreeview.cpp b/quanta/treeviews/templatestreeview.cpp
index bd00665f..a9aa75d0 100644
--- a/quanta/treeviews/templatestreeview.cpp
+++ b/quanta/treeviews/templatestreeview.cpp
@@ -48,11 +48,11 @@
 #include <kurlrequesterdlg.h>
 #include <ktempdir.h>
 #include <ktempfile.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kurldrag.h>
 #include <ktar.h>
 #include <kdebug.h>
-#include <kfile.h>
+#include <tdefile.h>
 
 
 #include "templatestreeview.h"
diff --git a/quanta/treeviews/uploadtreefile.cpp b/quanta/treeviews/uploadtreefile.cpp
index 9c055424..5257117e 100644
--- a/quanta/treeviews/uploadtreefile.cpp
+++ b/quanta/treeviews/uploadtreefile.cpp
@@ -19,7 +19,7 @@
 #include <tqfileinfo.h>
 
 // KDE includes
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kiconloader.h>
 #include <kurl.h>
 
diff --git a/quanta/treeviews/uploadtreeview.cpp b/quanta/treeviews/uploadtreeview.cpp
index 259b81dc..4c5af524 100644
--- a/quanta/treeviews/uploadtreeview.cpp
+++ b/quanta/treeviews/uploadtreeview.cpp
@@ -18,7 +18,7 @@
 #include <kcursor.h>
 #include <klocale.h>
 #include <kurl.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 #include "uploadtreeview.h"
 #include "quantacommon.h"
diff --git a/quanta/utility/quantabookmarks.cpp b/quanta/utility/quantabookmarks.cpp
index c27e07a7..0678a972 100644
--- a/quanta/utility/quantabookmarks.cpp
+++ b/quanta/utility/quantabookmarks.cpp
@@ -21,7 +21,7 @@
 #include "quantabookmarks.h"
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kaction.h>
 #include <kdebug.h>
diff --git a/quanta/utility/quantacommon.cpp b/quanta/utility/quantacommon.cpp
index e29c1013..e7f9380d 100644
--- a/quanta/utility/quantacommon.cpp
+++ b/quanta/utility/quantacommon.cpp
@@ -34,7 +34,7 @@
 #include <kmimetype.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kprotocolinfo.h>
 #include <kprogress.h>
diff --git a/quanta/utility/quantanetaccess.cpp b/quanta/utility/quantanetaccess.cpp
index 6fa248eb..eb47cb86 100644
--- a/quanta/utility/quantanetaccess.cpp
+++ b/quanta/utility/quantanetaccess.cpp
@@ -17,11 +17,11 @@
 #include <tqwidget.h>
 #include <tqdir.h>
 
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kurl.h>
 #include <kmessagebox.h>
 #include <klocale.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kstringhandler.h>
 
 #include "qextfileinfo.h"
diff --git a/quanta/utility/tagactionset.cpp b/quanta/utility/tagactionset.cpp
index 58af9c65..a5397df8 100644
--- a/quanta/utility/tagactionset.cpp
+++ b/quanta/utility/tagactionset.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kactioncollection.h>
 #include <kactionclasses.h>
 #include <dom/dom_node.h>