summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-14 17:05:42 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-14 17:05:42 -0600
commit0f00841dea9cb27181a97db2221a054779b49a89 (patch)
treea9d10780cf1861c603e7f4de79b35ed5e6183b7b
parent634b37663fbaee2a0d6471ab0ea93af5a06fb39b (diff)
downloadkmyfirewall-0f00841dea9cb27181a97db2221a054779b49a89.tar.gz
kmyfirewall-0f00841dea9cb27181a97db2221a054779b49a89.zip
Rename common header files for consistency with class renaming
-rw-r--r--KMFIPTInterface/kmfiptinterface.cpp2
-rw-r--r--KMFIPTInterface/main.cpp4
-rw-r--r--KMFSysTray/app.cpp8
-rw-r--r--KMFSysTray/app.h2
-rw-r--r--KMFSysTray/kmfiptwatcher.cpp4
-rw-r--r--KMFSysTray/kmfsystray.cpp4
-rw-r--r--KMFSysTray/main.cpp8
-rw-r--r--doc/kmyfirewall/index.docbook4
-rw-r--r--kmyfirewall/compilers/iptables/kmfiptablescompiler.cpp4
-rw-r--r--kmyfirewall/compilers/iptables/kmfiptablesscriptgenerator.cpp2
-rw-r--r--kmyfirewall/compilers/pf/kmfpfcompiler.cpp2
-rw-r--r--kmyfirewall/compilers/pf/kmfpfscriptgenerator.cpp2
-rw-r--r--kmyfirewall/core/kmfapp.h2
-rw-r--r--kmyfirewall/core/kmfdoc.cpp2
-rw-r--r--kmyfirewall/core/kmfgenericdoc.cpp2
-rw-r--r--kmyfirewall/core/kmfiptdoc.cpp2
-rw-r--r--kmyfirewall/core/kmfnetwork.cpp2
-rw-r--r--kmyfirewall/core/kmfplugin.cpp2
-rw-r--r--kmyfirewall/core/kmfpluginfactory.cpp2
-rw-r--r--kmyfirewall/core/kmfprotocollibrary.cpp2
-rw-r--r--kmyfirewall/core/kmftarget.cpp2
-rw-r--r--kmyfirewall/core/kprocesswrapper.cpp2
-rw-r--r--kmyfirewall/genericinterface/kmfgenericinterface_part.cpp4
-rw-r--r--kmyfirewall/installer/kmfinstallerplugin.cpp2
-rw-r--r--kmyfirewall/installer/linux/kmfiptinstaller.cpp4
-rw-r--r--kmyfirewall/installer/openbsd/kmfpfinstaller.cpp4
-rw-r--r--kmyfirewall/ipteditor/kmfchainedit.cpp2
-rw-r--r--kmyfirewall/ipteditor/kmfipteditorpart.cpp2
-rw-r--r--kmyfirewall/ipteditor/kmfruleedit.cpp2
-rw-r--r--kmyfirewall/kmfconfigdialog.cpp2
-rw-r--r--kmyfirewall/kmfdisclaimer.cpp2
-rw-r--r--kmyfirewall/kmfwidgets/kmfdocumentinfo.cpp2
-rw-r--r--kmyfirewall/kmfwidgets/kmfhostwidget.cpp2
-rw-r--r--kmyfirewall/kmfwidgets/kmfinterfacewidget.cpp2
-rw-r--r--kmyfirewall/kmfwidgets/kmfiptdocoptions.cpp2
-rw-r--r--kmyfirewall/kmfwidgets/kmflistview.cpp2
-rw-r--r--kmyfirewall/kmfwidgets/kmfnewdocdlg.cpp2
-rw-r--r--kmyfirewall/kmfwidgets/kmfobjectinfo.cpp2
-rw-r--r--kmyfirewall/kmfwidgets/kmfselectinterface.cpp4
-rw-r--r--kmyfirewall/kmfwidgets/kmfsystemsettingslinux.cpp2
-rw-r--r--kmyfirewall/kmfwidgets/kmftemplatechooser.cpp2
-rw-r--r--kmyfirewall/kmyfirewall.cpp4
-rw-r--r--kmyfirewall/kmyfirewall.h2
-rw-r--r--kmyfirewall/main.cpp4
-rw-r--r--kmyfirewall/ruleoptionplugins/custom_option/kmfruleeditcustomopt.cpp2
-rw-r--r--kmyfirewall/ruleoptionplugins/custom_option/kmfruleoptioneditcustom.cpp2
-rw-r--r--kmyfirewall/ruleoptionplugins/interface_option/kmfruleeditorinterface.cpp2
-rw-r--r--kmyfirewall/ruleoptionplugins/interface_option/kmfruleoptioneditinterface.cpp2
-rw-r--r--kmyfirewall/ruleoptionplugins/ip_option/kmfruleeditip.cpp2
-rw-r--r--kmyfirewall/ruleoptionplugins/ip_option/kmfruleoptioneditip.cpp2
-rw-r--r--kmyfirewall/ruleoptionplugins/limit_option/kmfruleeditorlimit.cpp2
-rw-r--r--kmyfirewall/ruleoptionplugins/limit_option/kmfruleoptioneditlimit.cpp2
-rw-r--r--kmyfirewall/ruleoptionplugins/log_target_option/kmfruleedittargetlog.cpp2
-rw-r--r--kmyfirewall/ruleoptionplugins/log_target_option/kmfruletargetoptioneditlog.cpp2
-rw-r--r--kmyfirewall/ruleoptionplugins/mac_option/kmfruleeditmac.cpp2
-rw-r--r--kmyfirewall/ruleoptionplugins/mac_option/kmfruleoptioneditmac.cpp2
-rw-r--r--kmyfirewall/ruleoptionplugins/mark_target_option/kmfruleedittargetmark.cpp2
-rw-r--r--kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptioneditmark.cpp2
-rw-r--r--kmyfirewall/ruleoptionplugins/nat_target_option/kmfruleeditortargetnat.cpp2
-rw-r--r--kmyfirewall/ruleoptionplugins/nat_target_option/kmfruletargetoptioneditnat.cpp2
-rw-r--r--kmyfirewall/ruleoptionplugins/protocol_option/kmfruleeditorprotocol.cpp2
-rw-r--r--kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoptioneditprotocol.cpp2
-rw-r--r--kmyfirewall/ruleoptionplugins/state_option/kmfruleeditorstate.cpp2
-rw-r--r--kmyfirewall/ruleoptionplugins/state_option/kmfruleoptioneditstate.cpp2
-rw-r--r--kmyfirewall/ruleoptionplugins/tos_option/kmfruleeditortos.cpp2
-rw-r--r--kmyfirewall/ruleoptionplugins/tos_option/kmfruleoptionedittos.cpp2
-rw-r--r--kmyfirewall/ruleoptionplugins/tos_target_option/kmfruleeditortos.cpp2
-rw-r--r--kmyfirewall/ruleoptionplugins/tos_target_option/kmfruletargetoptionedittos.cpp2
68 files changed, 85 insertions, 85 deletions
diff --git a/KMFIPTInterface/kmfiptinterface.cpp b/KMFIPTInterface/kmfiptinterface.cpp
index e88310d..69ddd22 100644
--- a/KMFIPTInterface/kmfiptinterface.cpp
+++ b/KMFIPTInterface/kmfiptinterface.cpp
@@ -22,7 +22,7 @@
#include "kmfiptinterface.h"
#include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <klocale.h>
#include <kmessagebox.h>
diff --git a/KMFIPTInterface/main.cpp b/KMFIPTInterface/main.cpp
index 83d5ca8..c7cbed8 100644
--- a/KMFIPTInterface/main.cpp
+++ b/KMFIPTInterface/main.cpp
@@ -20,8 +20,8 @@
#include <kuniqueapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
#include <kdebug.h>
#include <klocale.h>
#include <dcopclient.h>
diff --git a/KMFSysTray/app.cpp b/KMFSysTray/app.cpp
index 9071e84..7b9b3be 100644
--- a/KMFSysTray/app.cpp
+++ b/KMFSysTray/app.cpp
@@ -17,14 +17,14 @@
// // KDE includes
// #include <kglobal.h>
// #include <klocale.h>
-// #include <kaboutdata.h>
+// #include <tdeaboutdata.h>
// #include <tdeconfig.h>
-// #include <kapplication.h>
+// #include <tdeapplication.h>
// #include <kmessagebox.h>
-// #include <kapplication.h>
+// #include <tdeapplication.h>
// #include <kmessagebox.h>
// #include <dcopclient.h>
-// #include <kaboutapplication.h>
+// #include <tdeaboutapplication.h>
/*
diff --git a/KMFSysTray/app.h b/KMFSysTray/app.h
index a1bb7e8..e69b8ca 100644
--- a/KMFSysTray/app.h
+++ b/KMFSysTray/app.h
@@ -12,7 +12,7 @@
#ifndef APP_H
#define APP_H
-#include <kapplication.h>
+#include <tdeapplication.h>
/**
@author Christian Hubinger
diff --git a/KMFSysTray/kmfiptwatcher.cpp b/KMFSysTray/kmfiptwatcher.cpp
index ae472c5..358f108 100644
--- a/KMFSysTray/kmfiptwatcher.cpp
+++ b/KMFSysTray/kmfiptwatcher.cpp
@@ -27,9 +27,9 @@
#include <kdebug.h>
#include <klocale.h>
#include <kapp.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kmessagebox.h>
#include <dcopclient.h>
diff --git a/KMFSysTray/kmfsystray.cpp b/KMFSysTray/kmfsystray.cpp
index a24bbde..31a3cb6 100644
--- a/KMFSysTray/kmfsystray.cpp
+++ b/KMFSysTray/kmfsystray.cpp
@@ -26,10 +26,10 @@
// KDE includes
#include <kglobal.h>
#include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <tdeconfig.h>
#include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kmessagebox.h>
#include <dcopclient.h>
#include <kdebug.h>
diff --git a/KMFSysTray/main.cpp b/KMFSysTray/main.cpp
index 9c3c6e3..17e9a4d 100644
--- a/KMFSysTray/main.cpp
+++ b/KMFSysTray/main.cpp
@@ -12,10 +12,10 @@
#include <tqwidget.h>
-#include <kapplication.h>
-#include <kaboutapplication.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
#include <klocale.h>
#include <tdeconfig.h>
#include <kdebug.h>
diff --git a/doc/kmyfirewall/index.docbook b/doc/kmyfirewall/index.docbook
index 33c025f..4a40405 100644
--- a/doc/kmyfirewall/index.docbook
+++ b/doc/kmyfirewall/index.docbook
@@ -1139,7 +1139,7 @@ QWidget* KMFRuleOptionEditMAC::editWidget() {
// It's usually safe to leave the factory code alone.. with the
// notable exception of the TDEAboutData data
-#include &lt;kaboutdata.h&gt;
+#include &lt;tdeaboutdata.h&gt;
#include &lt;klocale.h&gt;
// TDEInstance* KMFRuleOptionEditMACFactory::s_instance = 0L;
@@ -1261,7 +1261,7 @@ Author: Christian Hubinger &lt;chubinger@gmail.com&gt;, (C) 2001-2004
#include &lt;kdebug.h&gt;
#include &lt;kmessagebox.h&gt;
#include &lt;klocale.h&gt;
-#include &lt;kapplication.h&gt;
+#include &lt;tdeapplication.h&gt;
// project includes
#include "../../core/iptrule.h"
diff --git a/kmyfirewall/compilers/iptables/kmfiptablescompiler.cpp b/kmyfirewall/compilers/iptables/kmfiptablescompiler.cpp
index 052630f..bfd7233 100644
--- a/kmyfirewall/compilers/iptables/kmfiptablescompiler.cpp
+++ b/kmyfirewall/compilers/iptables/kmfiptablescompiler.cpp
@@ -24,7 +24,7 @@
#include <ktempfile.h>
#include <tdeio/netaccess.h>
#include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
// Project includes
#include "../../version.h"
@@ -219,7 +219,7 @@ void KMFIPTablesCompiler::slotConvertToIPTDoc() {
// It's usually safe to leave the factory code alone.. with the
// notable exception of the TDEAboutData data
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <klocale.h>
// TDEInstance* KMFIPTablesCompilerFactory::s_instance = 0L;
diff --git a/kmyfirewall/compilers/iptables/kmfiptablesscriptgenerator.cpp b/kmyfirewall/compilers/iptables/kmfiptablesscriptgenerator.cpp
index 274faea..c46ba2c 100644
--- a/kmyfirewall/compilers/iptables/kmfiptablesscriptgenerator.cpp
+++ b/kmyfirewall/compilers/iptables/kmfiptablesscriptgenerator.cpp
@@ -26,7 +26,7 @@
#include <ktempfile.h>
#include <tdeio/netaccess.h>
#include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
// Project includes
#include "../../version.h"
diff --git a/kmyfirewall/compilers/pf/kmfpfcompiler.cpp b/kmyfirewall/compilers/pf/kmfpfcompiler.cpp
index 61ea42a..83fddc1 100644
--- a/kmyfirewall/compilers/pf/kmfpfcompiler.cpp
+++ b/kmyfirewall/compilers/pf/kmfpfcompiler.cpp
@@ -19,7 +19,7 @@
// KDE includes
#include <kdebug.h>
#include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <klocale.h>
// Project includes
diff --git a/kmyfirewall/compilers/pf/kmfpfscriptgenerator.cpp b/kmyfirewall/compilers/pf/kmfpfscriptgenerator.cpp
index b38cc38..067b57e 100644
--- a/kmyfirewall/compilers/pf/kmfpfscriptgenerator.cpp
+++ b/kmyfirewall/compilers/pf/kmfpfscriptgenerator.cpp
@@ -26,7 +26,7 @@
#include <ktempfile.h>
#include <tdeio/netaccess.h>
#include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
// Project includes
#include "../../version.h"
diff --git a/kmyfirewall/core/kmfapp.h b/kmyfirewall/core/kmfapp.h
index 838100c..ffca620 100644
--- a/kmyfirewall/core/kmfapp.h
+++ b/kmyfirewall/core/kmfapp.h
@@ -21,7 +21,7 @@
#include <tqstring.h>
// KDE includes
-#include <kapplication.h>
+#include <tdeapplication.h>
/**
*@author Christian Hubinger
diff --git a/kmyfirewall/core/kmfdoc.cpp b/kmyfirewall/core/kmfdoc.cpp
index 89a4851..5fb8bb2 100644
--- a/kmyfirewall/core/kmfdoc.cpp
+++ b/kmyfirewall/core/kmfdoc.cpp
@@ -42,7 +42,7 @@
#include <tdeio/netaccess.h>
#include <klocale.h>
#include <kprocess.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeconfig.h>
#include <kmessagebox.h>
#include <ktempfile.h>
diff --git a/kmyfirewall/core/kmfgenericdoc.cpp b/kmyfirewall/core/kmfgenericdoc.cpp
index bbd27ff..35fdb82 100644
--- a/kmyfirewall/core/kmfgenericdoc.cpp
+++ b/kmyfirewall/core/kmfgenericdoc.cpp
@@ -30,7 +30,7 @@
#include <tqstringlist.h>
// KDE includes
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <kstandarddirs.h>
#include <klocale.h>
diff --git a/kmyfirewall/core/kmfiptdoc.cpp b/kmyfirewall/core/kmfiptdoc.cpp
index 7c9a3cb..3843048 100644
--- a/kmyfirewall/core/kmfiptdoc.cpp
+++ b/kmyfirewall/core/kmfiptdoc.cpp
@@ -51,7 +51,7 @@
#include <tdeio/netaccess.h>
#include <klocale.h>
#include <kprocess.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeconfig.h>
#include <kmessagebox.h>
#include <ktempfile.h>
diff --git a/kmyfirewall/core/kmfnetwork.cpp b/kmyfirewall/core/kmfnetwork.cpp
index a42316d..4ea3d5b 100644
--- a/kmyfirewall/core/kmfnetwork.cpp
+++ b/kmyfirewall/core/kmfnetwork.cpp
@@ -29,7 +29,7 @@
#include <tqstringlist.h>
// KDE includes
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <kstandarddirs.h>
#include <klocale.h>
diff --git a/kmyfirewall/core/kmfplugin.cpp b/kmyfirewall/core/kmfplugin.cpp
index 1a9bcfc..b6272d3 100644
--- a/kmyfirewall/core/kmfplugin.cpp
+++ b/kmyfirewall/core/kmfplugin.cpp
@@ -15,7 +15,7 @@
#include <tqwidget.h>
// KDE includes
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
// Project includes
diff --git a/kmyfirewall/core/kmfpluginfactory.cpp b/kmyfirewall/core/kmfpluginfactory.cpp
index 09f4675..9eba609 100644
--- a/kmyfirewall/core/kmfpluginfactory.cpp
+++ b/kmyfirewall/core/kmfpluginfactory.cpp
@@ -25,7 +25,7 @@
#include <ktrader.h>
#include <klibloader.h>
#include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
// project includes
#include "kmfcompilerinterface.h"
#include "kmfruleoptioneditinterface.h"
diff --git a/kmyfirewall/core/kmfprotocollibrary.cpp b/kmyfirewall/core/kmfprotocollibrary.cpp
index a39ee46..faf0e5e 100644
--- a/kmyfirewall/core/kmfprotocollibrary.cpp
+++ b/kmyfirewall/core/kmfprotocollibrary.cpp
@@ -20,7 +20,7 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001-2004
#include <tqvaluelist.h>
// KDE includes
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <kstandarddirs.h>
#include <klocale.h>
diff --git a/kmyfirewall/core/kmftarget.cpp b/kmyfirewall/core/kmftarget.cpp
index d3cb411..a373190 100644
--- a/kmyfirewall/core/kmftarget.cpp
+++ b/kmyfirewall/core/kmftarget.cpp
@@ -17,7 +17,7 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001-2008
#include <tqwidget.h>
// KDE includes
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <klocale.h>
#include <kdebug.h>
#include <ktrader.h>
diff --git a/kmyfirewall/core/kprocesswrapper.cpp b/kmyfirewall/core/kprocesswrapper.cpp
index e0ef183..466d384 100644
--- a/kmyfirewall/core/kprocesswrapper.cpp
+++ b/kmyfirewall/core/kprocesswrapper.cpp
@@ -18,7 +18,7 @@
#include <tqtextstream.h>
// KDE includes
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kprocess.h>
#include <klocale.h>
#include <kdebug.h>
diff --git a/kmyfirewall/genericinterface/kmfgenericinterface_part.cpp b/kmyfirewall/genericinterface/kmfgenericinterface_part.cpp
index 25cb007..fc216f2 100644
--- a/kmyfirewall/genericinterface/kmfgenericinterface_part.cpp
+++ b/kmyfirewall/genericinterface/kmfgenericinterface_part.cpp
@@ -22,7 +22,7 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001
#include <tdeaction.h>
#include <kstdaction.h>
#include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <kmessagebox.h>
#include <kiconloader.h>
#include <tdeparts/genericfactory.h>
@@ -209,7 +209,7 @@ void KMFGenericInterfacePart::slotEnableActions( bool ) {
// It's usually safe to leave the factory code alone.. with the
// notable exception of the TDEAboutData data
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <klocale.h>
TDEInstance* KMFGenericInterfacePartFactory::s_instance = 0L;
diff --git a/kmyfirewall/installer/kmfinstallerplugin.cpp b/kmyfirewall/installer/kmfinstallerplugin.cpp
index c87e6f6..762367f 100644
--- a/kmyfirewall/installer/kmfinstallerplugin.cpp
+++ b/kmyfirewall/installer/kmfinstallerplugin.cpp
@@ -423,7 +423,7 @@ void KMFInstallerPlugin::slotEnableActions( bool ) {
// It's usually safe to leave the factory code alone.. with the
// notable exception of the TDEAboutData data
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <klocale.h>
TDEInstance* KMFInstallerPluginFactory::s_instance = 0L;
diff --git a/kmyfirewall/installer/linux/kmfiptinstaller.cpp b/kmyfirewall/installer/linux/kmfiptinstaller.cpp
index cd42647..045a913 100644
--- a/kmyfirewall/installer/linux/kmfiptinstaller.cpp
+++ b/kmyfirewall/installer/linux/kmfiptinstaller.cpp
@@ -28,7 +28,7 @@ email : chubinger@irrsinnig.org
#include <kstandarddirs.h>
#include <kdebug.h>
#include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeconfig.h>
#include <ktempfile.h>
#include <kmessagebox.h>
@@ -1134,7 +1134,7 @@ void KMFIPTInstaller::loadIcons() {
// It's usually safe to leave the factory code alone.. with the
// notable exception of the TDEAboutData data
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <klocale.h>
// TDEInstance* KMFIPTablesCompilerFactory::s_instance = 0L;
diff --git a/kmyfirewall/installer/openbsd/kmfpfinstaller.cpp b/kmyfirewall/installer/openbsd/kmfpfinstaller.cpp
index 19fbf0c..bd40003 100644
--- a/kmyfirewall/installer/openbsd/kmfpfinstaller.cpp
+++ b/kmyfirewall/installer/openbsd/kmfpfinstaller.cpp
@@ -31,7 +31,7 @@ email : chubinger@irrsinnig.org
#include <kstandarddirs.h>
#include <kdebug.h>
#include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeconfig.h>
#include <ktempfile.h>
#include <kmessagebox.h>
@@ -1094,7 +1094,7 @@ void KMFPFInstaller::generateInstallerPackage( KMFTarget* target, const KURL& pa
// It's usually safe to leave the factory code alone.. with the
// notable exception of the TDEAboutData data
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <klocale.h>
// TDEInstance* KMFIPTablesCompilerFactory::s_instance = 0L;
diff --git a/kmyfirewall/ipteditor/kmfchainedit.cpp b/kmyfirewall/ipteditor/kmfchainedit.cpp
index a498289..d151002 100644
--- a/kmyfirewall/ipteditor/kmfchainedit.cpp
+++ b/kmyfirewall/ipteditor/kmfchainedit.cpp
@@ -39,7 +39,7 @@
// KDE includes
#include <klocale.h>
#include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kmessagebox.h>
// Project Includes
diff --git a/kmyfirewall/ipteditor/kmfipteditorpart.cpp b/kmyfirewall/ipteditor/kmfipteditorpart.cpp
index bf4e5bf..7186bb3 100644
--- a/kmyfirewall/ipteditor/kmfipteditorpart.cpp
+++ b/kmyfirewall/ipteditor/kmfipteditorpart.cpp
@@ -29,7 +29,7 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001
#include <kdebug.h>
#include <kmessagebox.h>
#include <kiconloader.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <klocale.h>
// Project includes
diff --git a/kmyfirewall/ipteditor/kmfruleedit.cpp b/kmyfirewall/ipteditor/kmfruleedit.cpp
index 7b5bbcc..6c931ba 100644
--- a/kmyfirewall/ipteditor/kmfruleedit.cpp
+++ b/kmyfirewall/ipteditor/kmfruleedit.cpp
@@ -21,7 +21,7 @@ email : chubinger@irrsinnig.org
#include <tdelistview.h>
#include <tdepopupmenu.h>
#include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdelistbox.h>
#include <kpushbutton.h>
#include <kcombobox.h>
diff --git a/kmyfirewall/kmfconfigdialog.cpp b/kmyfirewall/kmfconfigdialog.cpp
index 1d6f782..88d5490 100644
--- a/kmyfirewall/kmfconfigdialog.cpp
+++ b/kmyfirewall/kmfconfigdialog.cpp
@@ -25,7 +25,7 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001-2004
#include <tqmessagebox.h>
// KDE includes
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <klocale.h>
#include <kurlrequester.h>
diff --git a/kmyfirewall/kmfdisclaimer.cpp b/kmyfirewall/kmfdisclaimer.cpp
index 5929cde..8afe035 100644
--- a/kmyfirewall/kmfdisclaimer.cpp
+++ b/kmyfirewall/kmfdisclaimer.cpp
@@ -22,7 +22,7 @@
#include <kdebug.h>
#include <kstandarddirs.h>
#include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
// qt
#include <tqmessagebox.h>
#include <tqfile.h>
diff --git a/kmyfirewall/kmfwidgets/kmfdocumentinfo.cpp b/kmyfirewall/kmfwidgets/kmfdocumentinfo.cpp
index f9f5646..d41c9fa 100644
--- a/kmyfirewall/kmfwidgets/kmfdocumentinfo.cpp
+++ b/kmyfirewall/kmfwidgets/kmfdocumentinfo.cpp
@@ -22,7 +22,7 @@
// KDE includes
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
// project includes
diff --git a/kmyfirewall/kmfwidgets/kmfhostwidget.cpp b/kmyfirewall/kmfwidgets/kmfhostwidget.cpp
index b7d7961..bd5fea0 100644
--- a/kmyfirewall/kmfwidgets/kmfhostwidget.cpp
+++ b/kmyfirewall/kmfwidgets/kmfhostwidget.cpp
@@ -27,7 +27,7 @@
#include <klocale.h>
#include <kmessagebox.h>
#include <tdeio/netaccess.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <ktrader.h>
#include <tdeparts/part.h>
#include <tdeparts/plugin.h>
diff --git a/kmyfirewall/kmfwidgets/kmfinterfacewidget.cpp b/kmyfirewall/kmfwidgets/kmfinterfacewidget.cpp
index 3807902..67e7e21 100644
--- a/kmyfirewall/kmfwidgets/kmfinterfacewidget.cpp
+++ b/kmyfirewall/kmfwidgets/kmfinterfacewidget.cpp
@@ -19,7 +19,7 @@
// KDE includes
#include <klocale.h>
#include <kcombobox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <klocale.h>
#include <kurlrequester.h>
diff --git a/kmyfirewall/kmfwidgets/kmfiptdocoptions.cpp b/kmyfirewall/kmfwidgets/kmfiptdocoptions.cpp
index b61f577..7817172 100644
--- a/kmyfirewall/kmfwidgets/kmfiptdocoptions.cpp
+++ b/kmyfirewall/kmfwidgets/kmfiptdocoptions.cpp
@@ -21,7 +21,7 @@
// kde includes
#include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kmessagebox.h>
#include <klocale.h>
diff --git a/kmyfirewall/kmfwidgets/kmflistview.cpp b/kmyfirewall/kmfwidgets/kmflistview.cpp
index f8c3b33..e0f3809 100644
--- a/kmyfirewall/kmfwidgets/kmflistview.cpp
+++ b/kmyfirewall/kmfwidgets/kmflistview.cpp
@@ -20,7 +20,7 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001-2004
#include <kiconloader.h>
// KDE includes
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <klocale.h>
#include <kmessagebox.h>
diff --git a/kmyfirewall/kmfwidgets/kmfnewdocdlg.cpp b/kmyfirewall/kmfwidgets/kmfnewdocdlg.cpp
index 1386bd0..f6ad717 100644
--- a/kmyfirewall/kmfwidgets/kmfnewdocdlg.cpp
+++ b/kmyfirewall/kmfwidgets/kmfnewdocdlg.cpp
@@ -13,7 +13,7 @@
* *
***************************************************************************/
-#include "kapplication.h"
+#include "tdeapplication.h"
#include "kmfnewdocdlg.h"
#include "../version.h"
#include "kmfnewdocdlg.moc"
diff --git a/kmyfirewall/kmfwidgets/kmfobjectinfo.cpp b/kmyfirewall/kmfwidgets/kmfobjectinfo.cpp
index 87f1778..4ff7bfe 100644
--- a/kmyfirewall/kmfwidgets/kmfobjectinfo.cpp
+++ b/kmyfirewall/kmfwidgets/kmfobjectinfo.cpp
@@ -17,7 +17,7 @@
// KDE Includes
#include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <klocale.h>
// QT includes
diff --git a/kmyfirewall/kmfwidgets/kmfselectinterface.cpp b/kmyfirewall/kmfwidgets/kmfselectinterface.cpp
index 5d65d79..821e750 100644
--- a/kmyfirewall/kmfwidgets/kmfselectinterface.cpp
+++ b/kmyfirewall/kmfwidgets/kmfselectinterface.cpp
@@ -21,11 +21,11 @@
#include <kdebug.h>
#include <kcombobox.h>
#include <kpushbutton.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <klocale.h>
#include <kstandarddirs.h>
#include <kglobal.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
// Project Includes
#include "../core/kmfconfig.h"
diff --git a/kmyfirewall/kmfwidgets/kmfsystemsettingslinux.cpp b/kmyfirewall/kmfwidgets/kmfsystemsettingslinux.cpp
index 83fee58..61a711a 100644
--- a/kmyfirewall/kmfwidgets/kmfsystemsettingslinux.cpp
+++ b/kmyfirewall/kmfwidgets/kmfsystemsettingslinux.cpp
@@ -20,7 +20,7 @@
// KDE includes
#include <klocale.h>
#include <kcombobox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <klocale.h>
#include <kurlrequester.h>
diff --git a/kmyfirewall/kmfwidgets/kmftemplatechooser.cpp b/kmyfirewall/kmfwidgets/kmftemplatechooser.cpp
index 0f1d1cc..b4e7abb 100644
--- a/kmyfirewall/kmfwidgets/kmftemplatechooser.cpp
+++ b/kmyfirewall/kmfwidgets/kmftemplatechooser.cpp
@@ -25,7 +25,7 @@
#include <kdebug.h>
#include <klocale.h>
#include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
// project includes
#include "../core/kmfconfig.h"
diff --git a/kmyfirewall/kmyfirewall.cpp b/kmyfirewall/kmyfirewall.cpp
index a5fdab8..ec7f537 100644
--- a/kmyfirewall/kmyfirewall.cpp
+++ b/kmyfirewall/kmyfirewall.cpp
@@ -23,7 +23,7 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001-2004
#include <tqlayout.h>
// KDE includes
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeaction.h>
#include <tdeaccel.h>
#include <kstdaction.h>
@@ -39,7 +39,7 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001-2004
#include <kglobal.h>
#include <kmessagebox.h>
#include <kstdguiitem.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <tdeio/netaccess.h>
#include <tdefileitem.h>
#include <klibloader.h>
diff --git a/kmyfirewall/kmyfirewall.h b/kmyfirewall/kmyfirewall.h
index c853d6f..730bc72 100644
--- a/kmyfirewall/kmyfirewall.h
+++ b/kmyfirewall/kmyfirewall.h
@@ -24,7 +24,7 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001-2004
#include <tqguardedptr.h>
// KDE includes
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdemainwindow.h>
#include <kprocess.h>
#include <tdeconfig.h>
diff --git a/kmyfirewall/main.cpp b/kmyfirewall/main.cpp
index 35a577c..88586a9 100644
--- a/kmyfirewall/main.cpp
+++ b/kmyfirewall/main.cpp
@@ -21,8 +21,8 @@
// KDE includes
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
#include <klocale.h>
#include <tdeconfig.h>
#include <kdebug.h>
diff --git a/kmyfirewall/ruleoptionplugins/custom_option/kmfruleeditcustomopt.cpp b/kmyfirewall/ruleoptionplugins/custom_option/kmfruleeditcustomopt.cpp
index cb3d0f2..0dac974 100644
--- a/kmyfirewall/ruleoptionplugins/custom_option/kmfruleeditcustomopt.cpp
+++ b/kmyfirewall/ruleoptionplugins/custom_option/kmfruleeditcustomopt.cpp
@@ -15,7 +15,7 @@
// KDE includes
#include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <klocale.h>
// QT includes
diff --git a/kmyfirewall/ruleoptionplugins/custom_option/kmfruleoptioneditcustom.cpp b/kmyfirewall/ruleoptionplugins/custom_option/kmfruleoptioneditcustom.cpp
index 633ecb6..1b55cef 100644
--- a/kmyfirewall/ruleoptionplugins/custom_option/kmfruleoptioneditcustom.cpp
+++ b/kmyfirewall/ruleoptionplugins/custom_option/kmfruleoptioneditcustom.cpp
@@ -92,7 +92,7 @@ TQWidget* KMFRuleOptionEditCustom::editWidget() {
// It's usually safe to leave the factory code alone.. with the
// notable exception of the TDEAboutData data
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <klocale.h>
// // TDEInstance* KMFRuleOptionEditCustomFactory::s_instance = 0L;
diff --git a/kmyfirewall/ruleoptionplugins/interface_option/kmfruleeditorinterface.cpp b/kmyfirewall/ruleoptionplugins/interface_option/kmfruleeditorinterface.cpp
index 12ce2c5..76ffacb 100644
--- a/kmyfirewall/ruleoptionplugins/interface_option/kmfruleeditorinterface.cpp
+++ b/kmyfirewall/ruleoptionplugins/interface_option/kmfruleeditorinterface.cpp
@@ -27,7 +27,7 @@
#include <kurl.h>
#include <kstandarddirs.h>
#include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <klocale.h>
diff --git a/kmyfirewall/ruleoptionplugins/interface_option/kmfruleoptioneditinterface.cpp b/kmyfirewall/ruleoptionplugins/interface_option/kmfruleoptioneditinterface.cpp
index 01527bf..4c6a004 100644
--- a/kmyfirewall/ruleoptionplugins/interface_option/kmfruleoptioneditinterface.cpp
+++ b/kmyfirewall/ruleoptionplugins/interface_option/kmfruleoptioneditinterface.cpp
@@ -82,7 +82,7 @@ TQWidget* KMFRuleOptionEditorInterface::editWidget() {
// It's usually safe to leave the factory code alone.. with the
// notable exception of the TDEAboutData data
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <klocale.h>
// TDEInstance* KMFRuleOptionEditorInterfaceFactory::s_instance = 0L;
diff --git a/kmyfirewall/ruleoptionplugins/ip_option/kmfruleeditip.cpp b/kmyfirewall/ruleoptionplugins/ip_option/kmfruleeditip.cpp
index c95f709..55c0fa4 100644
--- a/kmyfirewall/ruleoptionplugins/ip_option/kmfruleeditip.cpp
+++ b/kmyfirewall/ruleoptionplugins/ip_option/kmfruleeditip.cpp
@@ -25,7 +25,7 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001-2004
// KDE includes
#include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <klocale.h>
// project includes
diff --git a/kmyfirewall/ruleoptionplugins/ip_option/kmfruleoptioneditip.cpp b/kmyfirewall/ruleoptionplugins/ip_option/kmfruleoptioneditip.cpp
index 33efe0e..2bc0b6a 100644
--- a/kmyfirewall/ruleoptionplugins/ip_option/kmfruleoptioneditip.cpp
+++ b/kmyfirewall/ruleoptionplugins/ip_option/kmfruleoptioneditip.cpp
@@ -90,7 +90,7 @@ TQWidget* KMFRuleOptionEditIP::editWidget() {
// It's usually safe to leave the factory code alone.. with the
// notable exception of the TDEAboutData data
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <klocale.h>
// TDEInstance* KMFRuleOptionEditIPFactory::s_instance = 0L;
diff --git a/kmyfirewall/ruleoptionplugins/limit_option/kmfruleeditorlimit.cpp b/kmyfirewall/ruleoptionplugins/limit_option/kmfruleeditorlimit.cpp
index 206587b..8919e73 100644
--- a/kmyfirewall/ruleoptionplugins/limit_option/kmfruleeditorlimit.cpp
+++ b/kmyfirewall/ruleoptionplugins/limit_option/kmfruleeditorlimit.cpp
@@ -25,7 +25,7 @@
// kde includes
#include <klocale.h>
#include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kmessagebox.h>
// Project includes
diff --git a/kmyfirewall/ruleoptionplugins/limit_option/kmfruleoptioneditlimit.cpp b/kmyfirewall/ruleoptionplugins/limit_option/kmfruleoptioneditlimit.cpp
index d0fb653..a744463 100644
--- a/kmyfirewall/ruleoptionplugins/limit_option/kmfruleoptioneditlimit.cpp
+++ b/kmyfirewall/ruleoptionplugins/limit_option/kmfruleoptioneditlimit.cpp
@@ -92,7 +92,7 @@ TQWidget* KMFRuleOptionEditLimit::editWidget() {
// It's usually safe to leave the factory code alone.. with the
// notable exception of the TDEAboutData data
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <klocale.h>
// TDEInstance* KMFRuleOptionEditLimitFactory::s_instance = 0L;
diff --git a/kmyfirewall/ruleoptionplugins/log_target_option/kmfruleedittargetlog.cpp b/kmyfirewall/ruleoptionplugins/log_target_option/kmfruleedittargetlog.cpp
index 8bb5650..e098348 100644
--- a/kmyfirewall/ruleoptionplugins/log_target_option/kmfruleedittargetlog.cpp
+++ b/kmyfirewall/ruleoptionplugins/log_target_option/kmfruleedittargetlog.cpp
@@ -22,7 +22,7 @@
#include <tqlineedit.h>
// kde includes
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <klocale.h>
diff --git a/kmyfirewall/ruleoptionplugins/log_target_option/kmfruletargetoptioneditlog.cpp b/kmyfirewall/ruleoptionplugins/log_target_option/kmfruletargetoptioneditlog.cpp
index e7a3b36..04bd750 100644
--- a/kmyfirewall/ruleoptionplugins/log_target_option/kmfruletargetoptioneditlog.cpp
+++ b/kmyfirewall/ruleoptionplugins/log_target_option/kmfruletargetoptioneditlog.cpp
@@ -88,7 +88,7 @@ bool KMFRuleTargetOptionEditLog::setTarget( const TQString& target ){
// It's usually safe to leave the factory code alone.. with the
// notable exception of the TDEAboutData data
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <klocale.h>
// TDEInstance* KMFRuleTargetOptionEditLogFactory::s_instance = 0L;
diff --git a/kmyfirewall/ruleoptionplugins/mac_option/kmfruleeditmac.cpp b/kmyfirewall/ruleoptionplugins/mac_option/kmfruleeditmac.cpp
index 13ad162..68ce41d 100644
--- a/kmyfirewall/ruleoptionplugins/mac_option/kmfruleeditmac.cpp
+++ b/kmyfirewall/ruleoptionplugins/mac_option/kmfruleeditmac.cpp
@@ -25,7 +25,7 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001-2004
#include <kdebug.h>
#include <kmessagebox.h>
#include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
// project includes
#include "../../core/xmlnames.h"
diff --git a/kmyfirewall/ruleoptionplugins/mac_option/kmfruleoptioneditmac.cpp b/kmyfirewall/ruleoptionplugins/mac_option/kmfruleoptioneditmac.cpp
index 96060b9..3aebafd 100644
--- a/kmyfirewall/ruleoptionplugins/mac_option/kmfruleoptioneditmac.cpp
+++ b/kmyfirewall/ruleoptionplugins/mac_option/kmfruleoptioneditmac.cpp
@@ -80,7 +80,7 @@ TQWidget* KMFRuleOptionEditMAC::editWidget() {
// It's usually safe to leave the factory code alone.. with the
// notable exception of the TDEAboutData data
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <klocale.h>
// TDEInstance* KMFRuleOptionEditMACFactory::s_instance = 0L;
diff --git a/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruleedittargetmark.cpp b/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruleedittargetmark.cpp
index 4ceff96..b5e81e5 100644
--- a/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruleedittargetmark.cpp
+++ b/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruleedittargetmark.cpp
@@ -21,7 +21,7 @@
#include <tqspinbox.h>
// KDE includes
#include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <klocale.h>
// MY includes
diff --git a/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptioneditmark.cpp b/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptioneditmark.cpp
index 7da315a..c9e530c 100644
--- a/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptioneditmark.cpp
+++ b/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptioneditmark.cpp
@@ -93,7 +93,7 @@ bool KMFRuleTargetOptionEditMark::setTarget( const TQString& target ){
// It's usually safe to leave the factory code alone.. with the
// notable exception of the TDEAboutData data
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <klocale.h>
// TDEInstance* KMFRuleTargetOptionEditMarkFactory::s_instance = 0L;
diff --git a/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruleeditortargetnat.cpp b/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruleeditortargetnat.cpp
index 7563bac..78f64e3 100644
--- a/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruleeditortargetnat.cpp
+++ b/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruleeditortargetnat.cpp
@@ -25,7 +25,7 @@ email : chubinger@irrsinnig.org
// KDE include
#include <kdebug.h>
#include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kmessagebox.h>
// MY includes
diff --git a/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruletargetoptioneditnat.cpp b/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruletargetoptioneditnat.cpp
index 2c9c2d1..cc67773 100644
--- a/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruletargetoptioneditnat.cpp
+++ b/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruletargetoptioneditnat.cpp
@@ -105,7 +105,7 @@ bool KMFRuleTargetOptionEditNat::setTarget( const TQString& target ){
// It's usually safe to leave the factory code alone.. with the
// notable exception of the TDEAboutData data
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <klocale.h>
// TDEInstance* KMFRuleTargetOptionEditNatFactory::s_instance = 0L;
diff --git a/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleeditorprotocol.cpp b/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleeditorprotocol.cpp
index 9a9b67e..1737ac6 100644
--- a/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleeditorprotocol.cpp
+++ b/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleeditorprotocol.cpp
@@ -19,7 +19,7 @@
#include <kdebug.h>
#include <klocale.h>
#include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
// qt includes
#include <tqlayout.h>
diff --git a/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoptioneditprotocol.cpp b/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoptioneditprotocol.cpp
index 113fb14..0b11260 100644
--- a/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoptioneditprotocol.cpp
+++ b/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoptioneditprotocol.cpp
@@ -95,7 +95,7 @@ TQWidget* KMFRuleOptionEditProtocol::editWidget() {
// It's usually safe to leave the factory code alone.. with the
// notable exception of the TDEAboutData data
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <klocale.h>
// TDEInstance* KMFRuleOptionEditProtocolFactory::s_instance = 0L;
diff --git a/kmyfirewall/ruleoptionplugins/state_option/kmfruleeditorstate.cpp b/kmyfirewall/ruleoptionplugins/state_option/kmfruleeditorstate.cpp
index f551baa..090b276 100644
--- a/kmyfirewall/ruleoptionplugins/state_option/kmfruleeditorstate.cpp
+++ b/kmyfirewall/ruleoptionplugins/state_option/kmfruleeditorstate.cpp
@@ -24,7 +24,7 @@
// kde includes
#include <kdebug.h>
#include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kmessagebox.h>
// ProjectIncludes
diff --git a/kmyfirewall/ruleoptionplugins/state_option/kmfruleoptioneditstate.cpp b/kmyfirewall/ruleoptionplugins/state_option/kmfruleoptioneditstate.cpp
index 1bbacad..d62152f 100644
--- a/kmyfirewall/ruleoptionplugins/state_option/kmfruleoptioneditstate.cpp
+++ b/kmyfirewall/ruleoptionplugins/state_option/kmfruleoptioneditstate.cpp
@@ -88,7 +88,7 @@ TQWidget* KMFRuleOptionEditState::editWidget() {
// It's usually safe to leave the factory code alone.. with the
// notable exception of the TDEAboutData data
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <klocale.h>
// TDEInstance* KMFRuleOptionEditStateFactory::s_instance = 0L;
diff --git a/kmyfirewall/ruleoptionplugins/tos_option/kmfruleeditortos.cpp b/kmyfirewall/ruleoptionplugins/tos_option/kmfruleeditortos.cpp
index 9f51885..9d61ba5 100644
--- a/kmyfirewall/ruleoptionplugins/tos_option/kmfruleeditortos.cpp
+++ b/kmyfirewall/ruleoptionplugins/tos_option/kmfruleeditortos.cpp
@@ -25,7 +25,7 @@
// kde includes
#include <klocale.h>
#include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
// project includes
#include "../../core/xmlnames.h"
diff --git a/kmyfirewall/ruleoptionplugins/tos_option/kmfruleoptionedittos.cpp b/kmyfirewall/ruleoptionplugins/tos_option/kmfruleoptionedittos.cpp
index b2bc785..44e42c6 100644
--- a/kmyfirewall/ruleoptionplugins/tos_option/kmfruleoptionedittos.cpp
+++ b/kmyfirewall/ruleoptionplugins/tos_option/kmfruleoptionedittos.cpp
@@ -93,7 +93,7 @@ TQWidget* KMFRuleOptionEditTos::editWidget() {
// It's usually safe to leave the factory code alone.. with the
// notable exception of the TDEAboutData data
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <klocale.h>
// TDEInstance* KMFRuleOptionEditTosFactory::s_instance = 0L;
diff --git a/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruleeditortos.cpp b/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruleeditortos.cpp
index 0cba2b0..612069d 100644
--- a/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruleeditortos.cpp
+++ b/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruleeditortos.cpp
@@ -25,7 +25,7 @@
// kde includes
#include <klocale.h>
#include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
// project includes
#include "../../core/xmlnames.h"
diff --git a/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruletargetoptionedittos.cpp b/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruletargetoptionedittos.cpp
index 486f9b7..cdb10d0 100644
--- a/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruletargetoptionedittos.cpp
+++ b/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruletargetoptionedittos.cpp
@@ -92,7 +92,7 @@ bool KMFRuleTargetOptionEditTos::setTarget( const TQString& target ){
// It's usually safe to leave the factory code alone.. with the
// notable exception of the TDEAboutData data
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <klocale.h>
// TDEInstance* KMFRuleTargetOptionEditTosFactory::s_instance = 0L;