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

39 files changed, 66 insertions, 66 deletions

diff --git a/KMFSysTray/app.cpp b/KMFSysTray/app.cpp
index 97cdd91..9071e84 100644
--- a/KMFSysTray/app.cpp
+++ b/KMFSysTray/app.cpp
@@ -18,7 +18,7 @@
 // #include <kglobal.h>
 // #include <klocale.h>
 // #include <kaboutdata.h>
-// #include <kconfig.h>
+// #include <tdeconfig.h>
 // #include <kapplication.h>
 // #include <kmessagebox.h>
 // #include <kapplication.h>
diff --git a/KMFSysTray/kmfsystray.cpp b/KMFSysTray/kmfsystray.cpp
index 17cded0..e69c432 100644
--- a/KMFSysTray/kmfsystray.cpp
+++ b/KMFSysTray/kmfsystray.cpp
@@ -27,7 +27,7 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <kaboutdata.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <kapplication.h>
 #include <kmessagebox.h>
diff --git a/KMFSysTray/kmfsystray.h b/KMFSysTray/kmfsystray.h
index 7529daa..5437298 100644
--- a/KMFSysTray/kmfsystray.h
+++ b/KMFSysTray/kmfsystray.h
@@ -33,7 +33,7 @@
 // KDE Includes
 #include <kpanelapplet.h>
 #include <ksystemtray.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <dcopobject.h>
 
 class TDEAboutData;
diff --git a/KMFSysTray/main.cpp b/KMFSysTray/main.cpp
index 2fb03f3..7a16c0a 100644
--- a/KMFSysTray/main.cpp
+++ b/KMFSysTray/main.cpp
@@ -17,7 +17,7 @@
 #include <kcmdlineargs.h>
 #include <kaboutdata.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 
diff --git a/acinclude.m4 b/acinclude.m4
index f27e5a2..8094927 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$trinity2ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$trinity3ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libtdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
    AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
 fi
 ])
diff --git a/doc/Makefile b/doc/Makefile
index 46c6099..63efd9e 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -114,7 +114,7 @@ INSTALL_PROGRAM = ${INSTALL} $(INSTALL_STRIP_FLAG)
 INSTALL_SCRIPT = ${INSTALL}
 INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
 KCFG_DEPENDENCIES = $(KCONFIG_COMPILER)
-KCONFIG_COMPILER = /usr/bin/kconfig_compiler
+KCONFIG_COMPILER = /usr/bin/tdeconfig_compiler
 KDECONFIG = /usr/bin/tde-config
 KDE_CHECK_PLUGIN = $(KDE_PLUGIN) -rpath $(libdir)
 KDE_EXTRA_RPATH = 
diff --git a/doc/kmyfirewall/Makefile b/doc/kmyfirewall/Makefile
index 7ce4c54..2085ff9 100644
--- a/doc/kmyfirewall/Makefile
+++ b/doc/kmyfirewall/Makefile
@@ -98,7 +98,7 @@ INSTALL_PROGRAM = ${INSTALL} $(INSTALL_STRIP_FLAG)
 INSTALL_SCRIPT = ${INSTALL}
 INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
 KCFG_DEPENDENCIES = $(KCONFIG_COMPILER)
-KCONFIG_COMPILER = /usr/bin/kconfig_compiler
+KCONFIG_COMPILER = /usr/bin/tdeconfig_compiler
 KDECONFIG = /usr/bin/tde-config
 KDE_CHECK_PLUGIN = $(KDE_PLUGIN) -rpath $(libdir)
 KDE_EXTRA_RPATH = 
diff --git a/kmyfirewall/compilers/iptables/kmfiptablescompiler.cpp b/kmyfirewall/compilers/iptables/kmfiptablescompiler.cpp
index efad73d..616def3 100644
--- a/kmyfirewall/compilers/iptables/kmfiptablescompiler.cpp
+++ b/kmyfirewall/compilers/iptables/kmfiptablescompiler.cpp
@@ -20,9 +20,9 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <ktempfile.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kmessagebox.h>
 #include <kapplication.h>
 
diff --git a/kmyfirewall/compilers/iptables/kmfiptablesscriptgenerator.cpp b/kmyfirewall/compilers/iptables/kmfiptablesscriptgenerator.cpp
index e39d4f1..274faea 100644
--- a/kmyfirewall/compilers/iptables/kmfiptablesscriptgenerator.cpp
+++ b/kmyfirewall/compilers/iptables/kmfiptablesscriptgenerator.cpp
@@ -22,9 +22,9 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <ktempfile.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kmessagebox.h>
 #include <kapplication.h>
 
diff --git a/kmyfirewall/compilers/pf/kmfpfscriptgenerator.cpp b/kmyfirewall/compilers/pf/kmfpfscriptgenerator.cpp
index ce6b748..b38cc38 100644
--- a/kmyfirewall/compilers/pf/kmfpfscriptgenerator.cpp
+++ b/kmyfirewall/compilers/pf/kmfpfscriptgenerator.cpp
@@ -22,9 +22,9 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <ktempfile.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kmessagebox.h>
 #include <kapplication.h>
 
diff --git a/kmyfirewall/core/kmfapp.cpp b/kmyfirewall/core/kmfapp.cpp
index ef0b415..b32b9e3 100644
--- a/kmyfirewall/core/kmfapp.cpp
+++ b/kmyfirewall/core/kmfapp.cpp
@@ -25,7 +25,7 @@
 #include <kdebug.h>
 #include <kglobalsettings.h>
 #include <kurl.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 // Project includes
 #include "kmfapp.h"
 #include "../version.h"
diff --git a/kmyfirewall/core/kmfdoc.cpp b/kmyfirewall/core/kmfdoc.cpp
index 0d826f4..0c73267 100644
--- a/kmyfirewall/core/kmfdoc.cpp
+++ b/kmyfirewall/core/kmfdoc.cpp
@@ -35,15 +35,15 @@
 // KDE includes
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurl.h>
 #include <tqfiledialog.h>
-#include <kio/job.h>
-#include <kio/netaccess.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kprocess.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>
 
diff --git a/kmyfirewall/core/kmfgenericdoc.cpp b/kmyfirewall/core/kmfgenericdoc.cpp
index 1de7bcc..bbd27ff 100644
--- a/kmyfirewall/core/kmfgenericdoc.cpp
+++ b/kmyfirewall/core/kmfgenericdoc.cpp
@@ -34,8 +34,8 @@
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
-#include <kio/netaccess.h>
-#include <kio/job.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/job.h>
 #include <ktrader.h>
 #include <klibloader.h>
 
diff --git a/kmyfirewall/core/kmfiptdoc.cpp b/kmyfirewall/core/kmfiptdoc.cpp
index 6002ec0..50d7bb2 100644
--- a/kmyfirewall/core/kmfiptdoc.cpp
+++ b/kmyfirewall/core/kmfiptdoc.cpp
@@ -44,15 +44,15 @@
 // KDE includes
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurl.h>
 #include <tqfiledialog.h>
-#include <kio/job.h>
-#include <kio/netaccess.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kprocess.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>
 #include <ktrader.h>
diff --git a/kmyfirewall/core/kmfnetwork.cpp b/kmyfirewall/core/kmfnetwork.cpp
index 24b2af7..a42316d 100644
--- a/kmyfirewall/core/kmfnetwork.cpp
+++ b/kmyfirewall/core/kmfnetwork.cpp
@@ -33,8 +33,8 @@
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
-#include <kio/netaccess.h>
-#include <kio/job.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/job.h>
 #include <ktrader.h>
 #include <klibloader.h>
 
diff --git a/kmyfirewall/core/kmfprotocol.cpp b/kmyfirewall/core/kmfprotocol.cpp
index daec2e7..51902f5 100644
--- a/kmyfirewall/core/kmfprotocol.cpp
+++ b/kmyfirewall/core/kmfprotocol.cpp
@@ -33,12 +33,12 @@
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
-#include <kio/netaccess.h>
-#include <kio/job.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/job.h>
 #include <ktrader.h>
 #include <klibloader.h>
 #include <ktempfile.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 // project includes
 #include "../version.h"
diff --git a/kmyfirewall/core/kmfprotocollibrary.cpp b/kmyfirewall/core/kmfprotocollibrary.cpp
index 51b12c4..3aa45c4 100644
--- a/kmyfirewall/core/kmfprotocollibrary.cpp
+++ b/kmyfirewall/core/kmfprotocollibrary.cpp
@@ -24,12 +24,12 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001-2004
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
-#include <kio/netaccess.h>
-#include <kio/job.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/job.h>
 #include <ktrader.h>
 #include <klibloader.h>
 #include <ktempfile.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 // project includes
 #include "../version.h"
diff --git a/kmyfirewall/core/kmfprotocolusage.cpp b/kmyfirewall/core/kmfprotocolusage.cpp
index e621828..1de2303 100644
--- a/kmyfirewall/core/kmfprotocolusage.cpp
+++ b/kmyfirewall/core/kmfprotocolusage.cpp
@@ -23,12 +23,12 @@
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
-#include <kio/netaccess.h>
-#include <kio/job.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/job.h>
 #include <ktrader.h>
 #include <klibloader.h>
 #include <ktempfile.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 // project includes
 #include "../version.h"
diff --git a/kmyfirewall/core/kmftarget.cpp b/kmyfirewall/core/kmftarget.cpp
index 0dbdbb9..d3cb411 100644
--- a/kmyfirewall/core/kmftarget.cpp
+++ b/kmyfirewall/core/kmftarget.cpp
@@ -22,7 +22,7 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001-2008
 #include <kdebug.h>
 #include <ktrader.h>
 #include <kstandarddirs.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kmessagebox.h>
 
 // Project Inclueds
diff --git a/kmyfirewall/core/kprocesswrapper.cpp b/kmyfirewall/core/kprocesswrapper.cpp
index 09d2cd7..e0ef183 100644
--- a/kmyfirewall/core/kprocesswrapper.cpp
+++ b/kmyfirewall/core/kprocesswrapper.cpp
@@ -24,7 +24,7 @@
 #include <kdebug.h>
 #include <kurl.h>
 #include <ktempfile.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 // Project includes
 #include "kmftarget.h"
diff --git a/kmyfirewall/installer/kmfinstallerplugin.cpp b/kmyfirewall/installer/kmfinstallerplugin.cpp
index f29e309..1c8dc2b 100644
--- a/kmyfirewall/installer/kmfinstallerplugin.cpp
+++ b/kmyfirewall/installer/kmfinstallerplugin.cpp
@@ -25,14 +25,14 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001
 #include <kinstance.h>
 #include <kaction.h>
 #include <kstdaction.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
 #include <ktrader.h>
 #include <kstandarddirs.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 // Project includes
 #include "../core/kmfconfig.h"
diff --git a/kmyfirewall/installer/linux/kmfiptinstaller.cpp b/kmyfirewall/installer/linux/kmfiptinstaller.cpp
index 1139603..78e4255 100644
--- a/kmyfirewall/installer/linux/kmfiptinstaller.cpp
+++ b/kmyfirewall/installer/linux/kmfiptinstaller.cpp
@@ -29,11 +29,11 @@ email                : chubinger@irrsinnig.org
 #include <kdebug.h>
 #include <klocale.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ktempfile.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <ktar.h>
 #include <kmdcodec.h>
 
diff --git a/kmyfirewall/installer/openbsd/Makefile b/kmyfirewall/installer/openbsd/Makefile
index 10cde33..42ef76b 100644
--- a/kmyfirewall/installer/openbsd/Makefile
+++ b/kmyfirewall/installer/openbsd/Makefile
@@ -152,7 +152,7 @@ INSTALL_PROGRAM = ${INSTALL} $(INSTALL_STRIP_FLAG)
 INSTALL_SCRIPT = ${INSTALL}
 INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
 KCFG_DEPENDENCIES = $(KCONFIG_COMPILER)
-KCONFIG_COMPILER = /usr/bin/kconfig_compiler
+KCONFIG_COMPILER = /usr/bin/tdeconfig_compiler
 KDECONFIG = /usr/bin/tde-config
 KDE_CHECK_PLUGIN = $(KDE_PLUGIN) -rpath $(libdir)
 KDE_EXTRA_RPATH = 
diff --git a/kmyfirewall/installer/openbsd/kmfpfinstaller.cpp b/kmyfirewall/installer/openbsd/kmfpfinstaller.cpp
index 1a743be..429ee48 100644
--- a/kmyfirewall/installer/openbsd/kmfpfinstaller.cpp
+++ b/kmyfirewall/installer/openbsd/kmfpfinstaller.cpp
@@ -32,11 +32,11 @@ email                : chubinger@irrsinnig.org
 #include <kdebug.h>
 #include <klocale.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ktempfile.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <ktar.h>
 #include <kmdcodec.h>
 
diff --git a/kmyfirewall/ipteditor/kmfipteditorpart.cpp b/kmyfirewall/ipteditor/kmfipteditorpart.cpp
index 83e4e25..48c0362 100644
--- a/kmyfirewall/ipteditor/kmfipteditorpart.cpp
+++ b/kmyfirewall/ipteditor/kmfipteditorpart.cpp
@@ -24,7 +24,7 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001
 #include <kaction.h>
 #include <kstdaction.h>
 #include <kaccel.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
diff --git a/kmyfirewall/ipteditor/kmfruleedit.h b/kmyfirewall/ipteditor/kmfruleedit.h
index d9341ba..b7a256b 100644
--- a/kmyfirewall/ipteditor/kmfruleedit.h
+++ b/kmyfirewall/ipteditor/kmfruleedit.h
@@ -26,7 +26,7 @@
 #include <tqguardedptr.h>
 
 // kde includes
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h> 
 
diff --git a/kmyfirewall/kmfconfigdialog.h b/kmyfirewall/kmfconfigdialog.h
index f7fbc5d..e2843ba 100644
--- a/kmyfirewall/kmfconfigdialog.h
+++ b/kmyfirewall/kmfconfigdialog.h
@@ -15,7 +15,7 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001-2004
 
 #include <tqwidget.h>
 #include <kdialogbase.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kprocess.h>
 #include <tqstring.h>
diff --git a/kmyfirewall/kmfdisclaimer.cpp b/kmyfirewall/kmfdisclaimer.cpp
index ac3982a..5929cde 100644
--- a/kmyfirewall/kmfdisclaimer.cpp
+++ b/kmyfirewall/kmfdisclaimer.cpp
@@ -16,7 +16,7 @@
 #include "kmfdisclaimer.h"
 #include "kmyfirewall.h" 
 // kde
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <kurl.h>
 #include <kdebug.h>
diff --git a/kmyfirewall/kmfnet.desktop b/kmyfirewall/kmfnet.desktop
index fa87213..201823d 100644
--- a/kmyfirewall/kmfnet.desktop
+++ b/kmyfirewall/kmfnet.desktop
@@ -10,7 +10,7 @@ Comment[bg]=Мрежова настройка на KMyFirewall
 Comment[es]=Configuración de red de KMyFirewall
 Comment[et]=KMyFirewalli võrguseadistused
 Comment[it]=Configurazione di rete di KMyFirewall
-Comment[nl]=KMyFirewall netwerkconfiguratie
+Comment[nl]=KMyFirewall netwertdeconfiguratie
 Comment[pt]=Configuração da Rede do KMyFirewall
 Comment[pt_BR]=Configuração da Rede do KMyFirewall
 Comment[sr]=KMyFirewall - подешавање мреже
diff --git a/kmyfirewall/kmfwidgets/kmfgenericinterfaceeditprotocol.cpp b/kmyfirewall/kmfwidgets/kmfgenericinterfaceeditprotocol.cpp
index 538d9ff..6555d4b 100644
--- a/kmyfirewall/kmfwidgets/kmfgenericinterfaceeditprotocol.cpp
+++ b/kmyfirewall/kmfwidgets/kmfgenericinterfaceeditprotocol.cpp
@@ -45,8 +45,8 @@
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
-#include <kio/netaccess.h>
-#include <kio/job.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/job.h>
 #include <ktrader.h>
 #include <klibloader.h>
 #include <klistview.h>
diff --git a/kmyfirewall/kmfwidgets/kmfhostwidget.cpp b/kmyfirewall/kmfwidgets/kmfhostwidget.cpp
index c66fb92..84ed475 100644
--- a/kmyfirewall/kmfwidgets/kmfhostwidget.cpp
+++ b/kmyfirewall/kmfwidgets/kmfhostwidget.cpp
@@ -26,7 +26,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kapplication.h>
 #include <ktrader.h>
 #include <tdeparts/part.h>
diff --git a/kmyfirewall/kmfwidgets/kmfhostwidget.h b/kmyfirewall/kmfwidgets/kmfhostwidget.h
index a3cfde9..47afec9 100644
--- a/kmyfirewall/kmfwidgets/kmfhostwidget.h
+++ b/kmyfirewall/kmfwidgets/kmfhostwidget.h
@@ -17,7 +17,7 @@
 
 #include <tqwidget.h>
 #include <kdialogbase.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kprocess.h>
 #include <tqstring.h>
diff --git a/kmyfirewall/kmfwidgets/kmflistview.cpp b/kmyfirewall/kmfwidgets/kmflistview.cpp
index bcd49a0..e8689fc 100644
--- a/kmyfirewall/kmfwidgets/kmflistview.cpp
+++ b/kmyfirewall/kmfwidgets/kmflistview.cpp
@@ -24,7 +24,7 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001-2004
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 // Project includes
 #include "../core/netfilterobject.h"
diff --git a/kmyfirewall/kmfwidgets/kmfmynetworkwidget.h b/kmyfirewall/kmfwidgets/kmfmynetworkwidget.h
index a1f95ec..0a565bd 100644
--- a/kmyfirewall/kmfwidgets/kmfmynetworkwidget.h
+++ b/kmyfirewall/kmfwidgets/kmfmynetworkwidget.h
@@ -17,7 +17,7 @@
 
 #include <tqwidget.h>
 #include <kdialogbase.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kprocess.h>
 #include <tqstring.h>
diff --git a/kmyfirewall/kmfwidgets/kmfselectactivetarget.cpp b/kmyfirewall/kmfwidgets/kmfselectactivetarget.cpp
index bd9514b..83375ba 100644
--- a/kmyfirewall/kmfwidgets/kmfselectactivetarget.cpp
+++ b/kmyfirewall/kmfwidgets/kmfselectactivetarget.cpp
@@ -36,8 +36,8 @@
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
-#include <kio/netaccess.h>
-#include <kio/job.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/job.h>
 #include <ktrader.h>
 #include <klibloader.h>
 #include <klistview.h>
diff --git a/kmyfirewall/kmyfirewall.cpp b/kmyfirewall/kmyfirewall.cpp
index cb046a7..ee3778b 100644
--- a/kmyfirewall/kmyfirewall.cpp
+++ b/kmyfirewall/kmyfirewall.cpp
@@ -28,7 +28,7 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001-2004
 #include <kaccel.h>
 #include <kstdaction.h>
 #include <kstandarddirs.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <kmenubar.h>
 #include <kprocess.h>
@@ -40,8 +40,8 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001-2004
 #include <kmessagebox.h>
 #include <kstdguiitem.h>
 #include <kcmdlineargs.h>
-#include <kio/netaccess.h>
-#include <kfileitem.h>
+#include <tdeio/netaccess.h>
+#include <tdefileitem.h>
 #include <klibloader.h>
 #include <ktextedit.h>
 #include <tdeparts/partmanager.h>
diff --git a/kmyfirewall/kmyfirewall.h b/kmyfirewall/kmyfirewall.h
index d68baeb..4e56709 100644
--- a/kmyfirewall/kmyfirewall.h
+++ b/kmyfirewall/kmyfirewall.h
@@ -27,7 +27,7 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001-2004
 #include <kapplication.h>
 #include <kmainwindow.h>
 #include <kprocess.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kurl.h>
 #include <tdeparts/mainwindow.h>
 #include <tdeparts/dockmainwindow.h>
diff --git a/kmyfirewall/main.cpp b/kmyfirewall/main.cpp
index 241fe5c..dd4f5a9 100644
--- a/kmyfirewall/main.cpp
+++ b/kmyfirewall/main.cpp
@@ -24,7 +24,7 @@
 #include <kcmdlineargs.h>
 #include <kaboutdata.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 // project inclues
diff --git a/kmyfirewall/ruleoptionplugins/interface_option/kmfruleeditorinterface.cpp b/kmyfirewall/ruleoptionplugins/interface_option/kmfruleeditorinterface.cpp
index ebaf39b..12ce2c5 100644
--- a/kmyfirewall/ruleoptionplugins/interface_option/kmfruleeditorinterface.cpp
+++ b/kmyfirewall/ruleoptionplugins/interface_option/kmfruleeditorinterface.cpp
@@ -26,7 +26,7 @@
 #include <kcombobox.h>
 #include <kurl.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <kdebug.h> 
 #include <klocale.h>