diff options
| author | Timothy Pearson <[email protected]> | 2013-02-15 21:46:39 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-15 21:46:39 -0600 |
| commit | f4d08767799d812ea905925bef99faa5fd3d6321 (patch) | |
| tree | 349db4ae94f6b2a0cf009d0cd0f1dc552e03b644 | |
| parent | 0f00841dea9cb27181a97db2221a054779b49a89 (diff) | |
| download | kmyfirewall-f4d08767799d812ea905925bef99faa5fd3d6321.tar.gz kmyfirewall-f4d08767799d812ea905925bef99faa5fd3d6321.zip | |
Rename additional header files to avoid conflicts with KDE4
105 files changed, 199 insertions, 199 deletions
diff --git a/KMFIPTInterface/kmfiptinterface.cpp b/KMFIPTInterface/kmfiptinterface.cpp index 69ddd22..02c0cea 100644 --- a/KMFIPTInterface/kmfiptinterface.cpp +++ b/KMFIPTInterface/kmfiptinterface.cpp @@ -23,8 +23,8 @@ #include "kmfiptinterface.h" #include <kdebug.h> #include <tdeapplication.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <dcopobject.h> #include <dcopclient.h> diff --git a/KMFIPTInterface/main.cpp b/KMFIPTInterface/main.cpp index c7cbed8..f4026dd 100644 --- a/KMFIPTInterface/main.cpp +++ b/KMFIPTInterface/main.cpp @@ -23,7 +23,7 @@ #include <tdeaboutdata.h> #include <tdecmdlineargs.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <dcopclient.h> #include "kmfiptinterface.h" #include "version.h" diff --git a/KMFSysTray/app.cpp b/KMFSysTray/app.cpp index 7b9b3be..4ca7bf1 100644 --- a/KMFSysTray/app.cpp +++ b/KMFSysTray/app.cpp @@ -15,14 +15,14 @@ // #include <tqlayout.h> // // // KDE includes -// #include <kglobal.h> -// #include <klocale.h> +// #include <tdeglobal.h> +// #include <tdelocale.h> // #include <tdeaboutdata.h> // #include <tdeconfig.h> // #include <tdeapplication.h> -// #include <kmessagebox.h> +// #include <tdemessagebox.h> // #include <tdeapplication.h> -// #include <kmessagebox.h> +// #include <tdemessagebox.h> // #include <dcopclient.h> // #include <tdeaboutapplication.h> diff --git a/KMFSysTray/kmfiptwatcher.cpp b/KMFSysTray/kmfiptwatcher.cpp index 358f108..789fb25 100644 --- a/KMFSysTray/kmfiptwatcher.cpp +++ b/KMFSysTray/kmfiptwatcher.cpp @@ -25,12 +25,12 @@ // KDE includes #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kapp.h> #include <tdeapplication.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeapplication.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <dcopclient.h> // Project includes diff --git a/KMFSysTray/kmfsystray.cpp b/KMFSysTray/kmfsystray.cpp index 31a3cb6..afd5914 100644 --- a/KMFSysTray/kmfsystray.cpp +++ b/KMFSysTray/kmfsystray.cpp @@ -24,13 +24,13 @@ #include <tqlayout.h> // KDE includes -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <tdeconfig.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeapplication.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <dcopclient.h> #include <kdebug.h> #include <tdepopupmenu.h> diff --git a/KMFSysTray/main.cpp b/KMFSysTray/main.cpp index 17e9a4d..00b4bff 100644 --- a/KMFSysTray/main.cpp +++ b/KMFSysTray/main.cpp @@ -16,7 +16,7 @@ #include <tdeaboutapplication.h> #include <tdecmdlineargs.h> #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <kdebug.h> diff --git a/doc/kmyfirewall/index.docbook b/doc/kmyfirewall/index.docbook index 4a40405..1435246 100644 --- a/doc/kmyfirewall/index.docbook +++ b/doc/kmyfirewall/index.docbook @@ -1056,7 +1056,7 @@ public: // KDE includes #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> // Project includes #include "../../core/iptrule.h" @@ -1140,7 +1140,7 @@ QWidget* KMFRuleOptionEditMAC::editWidget() { // It's usually safe to leave the factory code alone.. with the // notable exception of the TDEAboutData data #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> // TDEInstance* KMFRuleOptionEditMACFactory::s_instance = 0L; // TDEAboutData* KMFRuleOptionEditMACFactory::s_about = 0L; @@ -1259,8 +1259,8 @@ Author: Christian Hubinger <[email protected]>, (C) 2001-2004 #include <qwhatsthis.h> #include <kdebug.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <tdeapplication.h> // project includes diff --git a/kmyfirewall/compilers/iptables/kmfiptablescompiler.cpp b/kmyfirewall/compilers/iptables/kmfiptablescompiler.cpp index bfd7233..3fbc70e 100644 --- a/kmyfirewall/compilers/iptables/kmfiptablescompiler.cpp +++ b/kmyfirewall/compilers/iptables/kmfiptablescompiler.cpp @@ -18,12 +18,12 @@ // KDE includes #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <tdefiledialog.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tdeio/netaccess.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeapplication.h> // Project includes @@ -220,7 +220,7 @@ void KMFIPTablesCompiler::slotConvertToIPTDoc() { // It's usually safe to leave the factory code alone.. with the // notable exception of the TDEAboutData data #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> // TDEInstance* KMFIPTablesCompilerFactory::s_instance = 0L; // TDEAboutData* KMFIPTablesCompilerFactory::s_about = 0L; diff --git a/kmyfirewall/compilers/iptables/kmfiptablesdocumentconverter.cpp b/kmyfirewall/compilers/iptables/kmfiptablesdocumentconverter.cpp index 09e8e37..71885d5 100644 --- a/kmyfirewall/compilers/iptables/kmfiptablesdocumentconverter.cpp +++ b/kmyfirewall/compilers/iptables/kmfiptablesdocumentconverter.cpp @@ -16,7 +16,7 @@ // KDE includes #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "../../version.h" #include "../../core/kmfgenericdoc.h" diff --git a/kmyfirewall/compilers/iptables/kmfiptablesscriptgenerator.cpp b/kmyfirewall/compilers/iptables/kmfiptablesscriptgenerator.cpp index c46ba2c..0063453 100644 --- a/kmyfirewall/compilers/iptables/kmfiptablesscriptgenerator.cpp +++ b/kmyfirewall/compilers/iptables/kmfiptablesscriptgenerator.cpp @@ -20,12 +20,12 @@ // KDE includes #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <tdefiledialog.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tdeio/netaccess.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeapplication.h> // Project includes diff --git a/kmyfirewall/compilers/pf/kmfpfcompiler.cpp b/kmyfirewall/compilers/pf/kmfpfcompiler.cpp index 83fddc1..4a854b1 100644 --- a/kmyfirewall/compilers/pf/kmfpfcompiler.cpp +++ b/kmyfirewall/compilers/pf/kmfpfcompiler.cpp @@ -18,9 +18,9 @@ // KDE includes #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> // Project includes #include "../../core/kmfgenericdoc.h" diff --git a/kmyfirewall/compilers/pf/kmfpfscriptgenerator.cpp b/kmyfirewall/compilers/pf/kmfpfscriptgenerator.cpp index 067b57e..c4206d6 100644 --- a/kmyfirewall/compilers/pf/kmfpfscriptgenerator.cpp +++ b/kmyfirewall/compilers/pf/kmfpfscriptgenerator.cpp @@ -20,12 +20,12 @@ // KDE includes #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <tdefiledialog.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tdeio/netaccess.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeapplication.h> // Project includes diff --git a/kmyfirewall/core/iptable.cpp b/kmyfirewall/core/iptable.cpp index 695981d..c611173 100644 --- a/kmyfirewall/core/iptable.cpp +++ b/kmyfirewall/core/iptable.cpp @@ -21,7 +21,7 @@ email : [email protected] // kde includes #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> // project includes #include "kmfcheckinput.h" diff --git a/kmyfirewall/core/iptchain.cpp b/kmyfirewall/core/iptchain.cpp index 8865695..fdacdac 100644 --- a/kmyfirewall/core/iptchain.cpp +++ b/kmyfirewall/core/iptchain.cpp @@ -19,8 +19,8 @@ // kde includes #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> //my includes #include "kmfdoc.h" #include "iptchain.h" diff --git a/kmyfirewall/core/iptrule.cpp b/kmyfirewall/core/iptrule.cpp index 3fa9fd7..a671026 100644 --- a/kmyfirewall/core/iptrule.cpp +++ b/kmyfirewall/core/iptrule.cpp @@ -28,7 +28,7 @@ email : [email protected] // kde includes #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> namespace KMF { diff --git a/kmyfirewall/core/iptruleoption.cpp b/kmyfirewall/core/iptruleoption.cpp index b356d7d..0f28cc7 100644 --- a/kmyfirewall/core/iptruleoption.cpp +++ b/kmyfirewall/core/iptruleoption.cpp @@ -15,7 +15,7 @@ email : [email protected] #include "iptruleoption.h" // KDE #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> // QT diff --git a/kmyfirewall/core/kmfapp.cpp b/kmyfirewall/core/kmfapp.cpp index 81fd357..f0349f6 100644 --- a/kmyfirewall/core/kmfapp.cpp +++ b/kmyfirewall/core/kmfapp.cpp @@ -23,7 +23,7 @@ // KDE includes #include <kstandarddirs.h> #include <kdebug.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kurl.h> #include <tdefiledialog.h> // Project includes diff --git a/kmyfirewall/core/kmfcheckinput.cpp b/kmyfirewall/core/kmfcheckinput.cpp index 5a9d3c7..831c158 100644 --- a/kmyfirewall/core/kmfcheckinput.cpp +++ b/kmyfirewall/core/kmfcheckinput.cpp @@ -22,7 +22,7 @@ #include <tqregexp.h> // KDE includes #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> namespace KMF { diff --git a/kmyfirewall/core/kmfdoc.cpp b/kmyfirewall/core/kmfdoc.cpp index 5fb8bb2..6f699f3 100644 --- a/kmyfirewall/core/kmfdoc.cpp +++ b/kmyfirewall/core/kmfdoc.cpp @@ -40,12 +40,12 @@ #include <tqfiledialog.h> #include <tdeio/job.h> #include <tdeio/netaccess.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprocess.h> #include <tdeapplication.h> #include <tdeconfig.h> -#include <kmessagebox.h> -#include <ktempfile.h> +#include <tdemessagebox.h> +#include <tdetempfile.h> // My includes #include "../version.h" diff --git a/kmyfirewall/core/kmferror.cpp b/kmyfirewall/core/kmferror.cpp index f520236..80a9887 100644 --- a/kmyfirewall/core/kmferror.cpp +++ b/kmyfirewall/core/kmferror.cpp @@ -20,7 +20,7 @@ // KDE includes #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> diff --git a/kmyfirewall/core/kmferrorhandler.cpp b/kmyfirewall/core/kmferrorhandler.cpp index ebe51be..d5b3140 100644 --- a/kmyfirewall/core/kmferrorhandler.cpp +++ b/kmyfirewall/core/kmferrorhandler.cpp @@ -16,12 +16,12 @@ #include "kmferrorhandler.h" // QT includes -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqstring.h> // KDE includes #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> // my includes #include "kmferror.h" diff --git a/kmyfirewall/core/kmfgenericdoc.cpp b/kmyfirewall/core/kmfgenericdoc.cpp index 35fdb82..0683992 100644 --- a/kmyfirewall/core/kmfgenericdoc.cpp +++ b/kmyfirewall/core/kmfgenericdoc.cpp @@ -33,7 +33,7 @@ #include <tdeapplication.h> #include <kdebug.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeio/netaccess.h> #include <tdeio/job.h> #include <ktrader.h> diff --git a/kmyfirewall/core/kmfiptdoc.cpp b/kmyfirewall/core/kmfiptdoc.cpp index 3843048..40ed400 100644 --- a/kmyfirewall/core/kmfiptdoc.cpp +++ b/kmyfirewall/core/kmfiptdoc.cpp @@ -49,12 +49,12 @@ #include <tqfiledialog.h> #include <tdeio/job.h> #include <tdeio/netaccess.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprocess.h> #include <tdeapplication.h> #include <tdeconfig.h> -#include <kmessagebox.h> -#include <ktempfile.h> +#include <tdemessagebox.h> +#include <tdetempfile.h> #include <ktrader.h> #include <klibloader.h> diff --git a/kmyfirewall/core/kmfnethost.cpp b/kmyfirewall/core/kmfnethost.cpp index d925db6..2c4580c 100644 --- a/kmyfirewall/core/kmfnethost.cpp +++ b/kmyfirewall/core/kmfnethost.cpp @@ -28,7 +28,7 @@ // KDE includes #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> // Project includes #include "kmfundoengine.h" diff --git a/kmyfirewall/core/kmfnetwork.cpp b/kmyfirewall/core/kmfnetwork.cpp index 4ea3d5b..b1e1d11 100644 --- a/kmyfirewall/core/kmfnetwork.cpp +++ b/kmyfirewall/core/kmfnetwork.cpp @@ -32,7 +32,7 @@ #include <tdeapplication.h> #include <kdebug.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeio/netaccess.h> #include <tdeio/job.h> #include <ktrader.h> diff --git a/kmyfirewall/core/kmfnetzone.cpp b/kmyfirewall/core/kmfnetzone.cpp index f6467ac..5a377d2 100644 --- a/kmyfirewall/core/kmfnetzone.cpp +++ b/kmyfirewall/core/kmfnetzone.cpp @@ -28,7 +28,7 @@ // KDE includes #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> // Project includes #include "kmfcheckinput.h" diff --git a/kmyfirewall/core/kmfpluginfactory.cpp b/kmyfirewall/core/kmfpluginfactory.cpp index 9eba609..0e43509 100644 --- a/kmyfirewall/core/kmfpluginfactory.cpp +++ b/kmyfirewall/core/kmfpluginfactory.cpp @@ -20,11 +20,11 @@ #include <tdeparts/part.h> #include <tdeparts/plugin.h> #include <tdeparts/factory.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <ktrader.h> #include <klibloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> // project includes #include "kmfcompilerinterface.h" diff --git a/kmyfirewall/core/kmfprotocol.cpp b/kmyfirewall/core/kmfprotocol.cpp index 51902f5..8eaec7a 100644 --- a/kmyfirewall/core/kmfprotocol.cpp +++ b/kmyfirewall/core/kmfprotocol.cpp @@ -32,12 +32,12 @@ // KDE includes #include <kdebug.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeio/netaccess.h> #include <tdeio/job.h> #include <ktrader.h> #include <klibloader.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tdefileitem.h> // project includes diff --git a/kmyfirewall/core/kmfprotocolcategory.cpp b/kmyfirewall/core/kmfprotocolcategory.cpp index d5d7562..ca21e07 100644 --- a/kmyfirewall/core/kmfprotocolcategory.cpp +++ b/kmyfirewall/core/kmfprotocolcategory.cpp @@ -16,7 +16,7 @@ // KDE includes #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> // Project includes #include "kmfundoengine.h" diff --git a/kmyfirewall/core/kmfprotocollibrary.cpp b/kmyfirewall/core/kmfprotocollibrary.cpp index faf0e5e..29fa3a5 100644 --- a/kmyfirewall/core/kmfprotocollibrary.cpp +++ b/kmyfirewall/core/kmfprotocollibrary.cpp @@ -23,12 +23,12 @@ Author: Christian Hubinger <[email protected]>, (C) 2001-2004 #include <tdeapplication.h> #include <kdebug.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeio/netaccess.h> #include <tdeio/job.h> #include <ktrader.h> #include <klibloader.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tdefileitem.h> // project includes diff --git a/kmyfirewall/core/kmfprotocolusage.cpp b/kmyfirewall/core/kmfprotocolusage.cpp index 1de2303..647a213 100644 --- a/kmyfirewall/core/kmfprotocolusage.cpp +++ b/kmyfirewall/core/kmfprotocolusage.cpp @@ -22,12 +22,12 @@ // KDE includes #include <kdebug.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeio/netaccess.h> #include <tdeio/job.h> #include <ktrader.h> #include <klibloader.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tdefileitem.h> // project includes diff --git a/kmyfirewall/core/kmfrulesetdoc.cpp b/kmyfirewall/core/kmfrulesetdoc.cpp index e0cec49..e506987 100644 --- a/kmyfirewall/core/kmfrulesetdoc.cpp +++ b/kmyfirewall/core/kmfrulesetdoc.cpp @@ -18,7 +18,7 @@ // KDE includes -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> // Project Inclueds diff --git a/kmyfirewall/core/kmftarget.cpp b/kmyfirewall/core/kmftarget.cpp index a373190..b56eb41 100644 --- a/kmyfirewall/core/kmftarget.cpp +++ b/kmyfirewall/core/kmftarget.cpp @@ -18,12 +18,12 @@ Author: Christian Hubinger <[email protected]>, (C) 2001-2008 // KDE includes #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <ktrader.h> #include <kstandarddirs.h> #include <tdeio/netaccess.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> // Project Inclueds #include "ipaddress.h" diff --git a/kmyfirewall/core/kmftargetconfig.cpp b/kmyfirewall/core/kmftargetconfig.cpp index c72e0c0..573772b 100644 --- a/kmyfirewall/core/kmftargetconfig.cpp +++ b/kmyfirewall/core/kmftargetconfig.cpp @@ -17,7 +17,7 @@ Author: Christian Hubinger <[email protected]>, (C) 2001-2008 // KDE includes #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> // Project includes #include "kmftarget.h" diff --git a/kmyfirewall/core/kmftransaction.cpp b/kmyfirewall/core/kmftransaction.cpp index e8d8c6d..8fe7993 100644 --- a/kmyfirewall/core/kmftransaction.cpp +++ b/kmyfirewall/core/kmftransaction.cpp @@ -13,7 +13,7 @@ Author: Christian Hubinger <[email protected]>, (C) 2001-2008 // KDE includes #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> // Project includes #include "netfilterobject.h" diff --git a/kmyfirewall/core/kmfundoengine.cpp b/kmyfirewall/core/kmfundoengine.cpp index 584f0e2..8f286d7 100644 --- a/kmyfirewall/core/kmfundoengine.cpp +++ b/kmyfirewall/core/kmfundoengine.cpp @@ -14,7 +14,7 @@ Author: Christian Hubinger <[email protected]>, (C) 2001-2008 // KDE includes #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> // Project includes diff --git a/kmyfirewall/core/kprocesswrapper.cpp b/kmyfirewall/core/kprocesswrapper.cpp index 466d384..fc9fddc 100644 --- a/kmyfirewall/core/kprocesswrapper.cpp +++ b/kmyfirewall/core/kprocesswrapper.cpp @@ -20,10 +20,10 @@ // KDE includes #include <tdeapplication.h> #include <kprocess.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kurl.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tdeio/netaccess.h> // Project includes diff --git a/kmyfirewall/core/netfilterobject.cpp b/kmyfirewall/core/netfilterobject.cpp index b7b4310..dc7673d 100644 --- a/kmyfirewall/core/netfilterobject.cpp +++ b/kmyfirewall/core/netfilterobject.cpp @@ -16,7 +16,7 @@ #include "netfilterobject.h" // KDE includes -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> // project includes diff --git a/kmyfirewall/genericinterface/kmfgenericinterface.cpp b/kmyfirewall/genericinterface/kmfgenericinterface.cpp index d123b0d..00f7814 100644 --- a/kmyfirewall/genericinterface/kmfgenericinterface.cpp +++ b/kmyfirewall/genericinterface/kmfgenericinterface.cpp @@ -28,9 +28,9 @@ #include <tqtabwidget.h> // kde includes -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> diff --git a/kmyfirewall/genericinterface/kmfgenericinterface_part.cpp b/kmyfirewall/genericinterface/kmfgenericinterface_part.cpp index fc216f2..de9635b 100644 --- a/kmyfirewall/genericinterface/kmfgenericinterface_part.cpp +++ b/kmyfirewall/genericinterface/kmfgenericinterface_part.cpp @@ -21,9 +21,9 @@ Author: Christian Hubinger <[email protected]>, (C) 2001 #include <kinstance.h> #include <tdeaction.h> #include <kstdaction.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kiconloader.h> #include <tdeparts/genericfactory.h> @@ -210,7 +210,7 @@ void KMFGenericInterfacePart::slotEnableActions( bool ) { // It's usually safe to leave the factory code alone.. with the // notable exception of the TDEAboutData data #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> TDEInstance* KMFGenericInterfacePartFactory::s_instance = 0L; TDEAboutData* KMFGenericInterfacePartFactory::s_about = 0L; diff --git a/kmyfirewall/genericinterface/kmfgenericinterfacehost.cpp b/kmyfirewall/genericinterface/kmfgenericinterfacehost.cpp index 049e878..e3908b7 100644 --- a/kmyfirewall/genericinterface/kmfgenericinterfacehost.cpp +++ b/kmyfirewall/genericinterface/kmfgenericinterfacehost.cpp @@ -30,14 +30,14 @@ #include <tqtimer.h> // KDE includes -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdelistview.h> #include <tdepopupmenu.h> #include <kpushbutton.h> #include <kiconloader.h> #include <knuminput.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstdguiitem.h> // Project includes diff --git a/kmyfirewall/genericinterface/kmfgenericinterfaceicmp.cpp b/kmyfirewall/genericinterface/kmfgenericinterfaceicmp.cpp index dc75341..aa6341b 100644 --- a/kmyfirewall/genericinterface/kmfgenericinterfaceicmp.cpp +++ b/kmyfirewall/genericinterface/kmfgenericinterfaceicmp.cpp @@ -27,7 +27,7 @@ #include <tqcheckbox.h> // KDE includes -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> // Project includes diff --git a/kmyfirewall/genericinterface/kmfgenericinterfacelogging.cpp b/kmyfirewall/genericinterface/kmfgenericinterfacelogging.cpp index 09c9fa2..fd2812f 100644 --- a/kmyfirewall/genericinterface/kmfgenericinterfacelogging.cpp +++ b/kmyfirewall/genericinterface/kmfgenericinterfacelogging.cpp @@ -28,7 +28,7 @@ #include <tqtimer.h> // KDE includes -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <krestrictedline.h> diff --git a/kmyfirewall/genericinterface/kmfgenericinterfacenat.cpp b/kmyfirewall/genericinterface/kmfgenericinterfacenat.cpp index fa73097..59926b1 100644 --- a/kmyfirewall/genericinterface/kmfgenericinterfacenat.cpp +++ b/kmyfirewall/genericinterface/kmfgenericinterfacenat.cpp @@ -31,7 +31,7 @@ // KDE includes #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcombobox.h> #include <knuminput.h> #include <tdelistview.h> diff --git a/kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp b/kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp index 98892d9..3c6830e 100644 --- a/kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp +++ b/kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp @@ -37,7 +37,7 @@ // KDE includes #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdelistview.h> #include <kcombobox.h> #include <tdepopupmenu.h> diff --git a/kmyfirewall/installer/kmfinstallerplugin.cpp b/kmyfirewall/installer/kmfinstallerplugin.cpp index 762367f..894edfe 100644 --- a/kmyfirewall/installer/kmfinstallerplugin.cpp +++ b/kmyfirewall/installer/kmfinstallerplugin.cpp @@ -26,10 +26,10 @@ Author: Christian Hubinger <[email protected]>, (C) 2001 #include <tdeaction.h> #include <kstdaction.h> #include <tdefiledialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <ktrader.h> #include <kstandarddirs.h> #include <tdeio/netaccess.h> @@ -424,7 +424,7 @@ void KMFInstallerPlugin::slotEnableActions( bool ) { // It's usually safe to leave the factory code alone.. with the // notable exception of the TDEAboutData data #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> TDEInstance* KMFInstallerPluginFactory::s_instance = 0L; diff --git a/kmyfirewall/installer/linux/kmfiptinstaller.cpp b/kmyfirewall/installer/linux/kmfiptinstaller.cpp index 045a913..bed8920 100644 --- a/kmyfirewall/installer/linux/kmfiptinstaller.cpp +++ b/kmyfirewall/installer/linux/kmfiptinstaller.cpp @@ -27,11 +27,11 @@ email : [email protected] #include <kurl.h> #include <kstandarddirs.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <tdeconfig.h> -#include <ktempfile.h> -#include <kmessagebox.h> +#include <tdetempfile.h> +#include <tdemessagebox.h> #include <kiconloader.h> #include <tdeio/netaccess.h> #include <ktar.h> @@ -1135,7 +1135,7 @@ void KMFIPTInstaller::loadIcons() { // It's usually safe to leave the factory code alone.. with the // notable exception of the TDEAboutData data #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> // TDEInstance* KMFIPTablesCompilerFactory::s_instance = 0L; // TDEAboutData* KMFIPTablesCompilerFactory::s_about = 0L; diff --git a/kmyfirewall/installer/openbsd/kmfpfinstaller.cpp b/kmyfirewall/installer/openbsd/kmfpfinstaller.cpp index bd40003..0320f31 100644 --- a/kmyfirewall/installer/openbsd/kmfpfinstaller.cpp +++ b/kmyfirewall/installer/openbsd/kmfpfinstaller.cpp @@ -30,11 +30,11 @@ email : [email protected] #include <kurl.h> #include <kstandarddirs.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <tdeconfig.h> -#include <ktempfile.h> -#include <kmessagebox.h> +#include <tdetempfile.h> +#include <tdemessagebox.h> #include <kiconloader.h> #include <tdeio/netaccess.h> #include <ktar.h> @@ -1095,7 +1095,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 <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> // TDEInstance* KMFIPTablesCompilerFactory::s_instance = 0L; // TDEAboutData* KMFIPTablesCompilerFactory::s_about = 0L; diff --git a/kmyfirewall/ipteditor/kmfchainedit.cpp b/kmyfirewall/ipteditor/kmfchainedit.cpp index d151002..4a129b2 100644 --- a/kmyfirewall/ipteditor/kmfchainedit.cpp +++ b/kmyfirewall/ipteditor/kmfchainedit.cpp @@ -37,10 +37,10 @@ #include <tqtabwidget.h> // KDE includes -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeapplication.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> // Project Includes #include "../core/xmlnames.h" diff --git a/kmyfirewall/ipteditor/kmfipteditorpart.cpp b/kmyfirewall/ipteditor/kmfipteditorpart.cpp index 7186bb3..e4cdaa7 100644 --- a/kmyfirewall/ipteditor/kmfipteditorpart.cpp +++ b/kmyfirewall/ipteditor/kmfipteditorpart.cpp @@ -25,12 +25,12 @@ Author: Christian Hubinger <[email protected]>, (C) 2001 #include <kstdaction.h> #include <tdeaccel.h> #include <tdefiledialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kiconloader.h> #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> // Project includes #include "kmfruleedit.h" diff --git a/kmyfirewall/ipteditor/kmfnewchaindlg.cpp b/kmyfirewall/ipteditor/kmfnewchaindlg.cpp index 4aabb8d..cd896e1 100644 --- a/kmyfirewall/ipteditor/kmfnewchaindlg.cpp +++ b/kmyfirewall/ipteditor/kmfnewchaindlg.cpp @@ -23,9 +23,9 @@ #include <tqevent.h> // kde includes -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> // my includes #include "../core/xmlnames.h" diff --git a/kmyfirewall/ipteditor/kmfruleedit.cpp b/kmyfirewall/ipteditor/kmfruleedit.cpp index 6c931ba..6006128 100644 --- a/kmyfirewall/ipteditor/kmfruleedit.cpp +++ b/kmyfirewall/ipteditor/kmfruleedit.cpp @@ -17,10 +17,10 @@ email : [email protected] //KDE includes #include <kled.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdelistview.h> #include <tdepopupmenu.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeapplication.h> #include <tdelistbox.h> #include <kpushbutton.h> diff --git a/kmyfirewall/kmfconfigdialog.cpp b/kmyfirewall/kmfconfigdialog.cpp index 88d5490..bb278aa 100644 --- a/kmyfirewall/kmfconfigdialog.cpp +++ b/kmyfirewall/kmfconfigdialog.cpp @@ -27,7 +27,7 @@ Author: Christian Hubinger <[email protected]>, (C) 2001-2004 // KDE includes #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurlrequester.h> #include <kguiitem.h> #include <kpushbutton.h> @@ -35,8 +35,8 @@ Author: Christian Hubinger <[email protected]>, (C) 2001-2004 #include <tdelistbox.h> #include <kcombobox.h> #include <kiconloader.h> -#include <kglobal.h> -#include <kmessagebox.h> +#include <tdeglobal.h> +#include <tdemessagebox.h> #include <tdelistview.h> #include <ktrader.h> #include <tdeparts/part.h> diff --git a/kmyfirewall/kmfconfigdialog.h b/kmyfirewall/kmfconfigdialog.h index 04359ef..2fcc98c 100644 --- a/kmyfirewall/kmfconfigdialog.h +++ b/kmyfirewall/kmfconfigdialog.h @@ -16,7 +16,7 @@ Author: Christian Hubinger <[email protected]>, (C) 2001-2004 #include <tqwidget.h> #include <kdialogbase.h> #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kprocess.h> #include <tqstring.h> #include <tqpixmap.h> diff --git a/kmyfirewall/kmfdisclaimer.cpp b/kmyfirewall/kmfdisclaimer.cpp index 8afe035..25e8334 100644 --- a/kmyfirewall/kmfdisclaimer.cpp +++ b/kmyfirewall/kmfdisclaimer.cpp @@ -21,7 +21,7 @@ #include <kurl.h> #include <kdebug.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> // qt #include <tqmessagebox.h> diff --git a/kmyfirewall/kmfwidgets/kmfchecklistoutput.cpp b/kmyfirewall/kmfwidgets/kmfchecklistoutput.cpp index afd2f91..7fc9f1a 100644 --- a/kmyfirewall/kmfwidgets/kmfchecklistoutput.cpp +++ b/kmyfirewall/kmfwidgets/kmfchecklistoutput.cpp @@ -24,9 +24,9 @@ #include <tqstring.h> // kde includes -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> namespace KMF { diff --git a/kmyfirewall/kmfwidgets/kmfgenericinterfaceeditprotocol.cpp b/kmyfirewall/kmfwidgets/kmfgenericinterfaceeditprotocol.cpp index 39f252b..12a6635 100644 --- a/kmyfirewall/kmfwidgets/kmfgenericinterfaceeditprotocol.cpp +++ b/kmyfirewall/kmfwidgets/kmfgenericinterfaceeditprotocol.cpp @@ -41,10 +41,10 @@ #include <tqcombobox.h> // KDE includes -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeio/netaccess.h> #include <tdeio/job.h> #include <ktrader.h> @@ -53,8 +53,8 @@ #include <tdelistbox.h> #include <knuminput.h> #include <kpushbutton.h> -#include <kmessagebox.h> -#include <ktempfile.h> +#include <tdemessagebox.h> +#include <tdetempfile.h> #include <kcombobox.h> // Project includes diff --git a/kmyfirewall/kmfwidgets/kmfhostwidget.cpp b/kmyfirewall/kmfwidgets/kmfhostwidget.cpp index bd5fea0..54a9bf4 100644 --- a/kmyfirewall/kmfwidgets/kmfhostwidget.cpp +++ b/kmyfirewall/kmfwidgets/kmfhostwidget.cpp @@ -24,8 +24,8 @@ #include <kcombobox.h> #include <knuminput.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdeio/netaccess.h> #include <tdeapplication.h> #include <ktrader.h> diff --git a/kmyfirewall/kmfwidgets/kmfhostwidget.h b/kmyfirewall/kmfwidgets/kmfhostwidget.h index 47afec9..aadb16b 100644 --- a/kmyfirewall/kmfwidgets/kmfhostwidget.h +++ b/kmyfirewall/kmfwidgets/kmfhostwidget.h @@ -18,7 +18,7 @@ #include <tqwidget.h> #include <kdialogbase.h> #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kprocess.h> #include <tqstring.h> #include <tqpixmap.h> diff --git a/kmyfirewall/kmfwidgets/kmfinterfacewidget.cpp b/kmyfirewall/kmfwidgets/kmfinterfacewidget.cpp index 67e7e21..6c30c26 100644 --- a/kmyfirewall/kmfwidgets/kmfinterfacewidget.cpp +++ b/kmyfirewall/kmfwidgets/kmfinterfacewidget.cpp @@ -17,11 +17,11 @@ #include <tqstringlist.h> // KDE includes -#include <klocale.h> +#include <tdelocale.h> #include <kcombobox.h> #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurlrequester.h> #include <kguiitem.h> #include <kpushbutton.h> @@ -29,8 +29,8 @@ #include <tdelistbox.h> #include <kcombobox.h> #include <kiconloader.h> -#include <kglobal.h> -#include <kmessagebox.h> +#include <tdeglobal.h> +#include <tdemessagebox.h> #include <tdelistview.h> // Prokject includes diff --git a/kmyfirewall/kmfwidgets/kmfiptdocoptions.cpp b/kmyfirewall/kmfwidgets/kmfiptdocoptions.cpp index 7817172..4aa52ed 100644 --- a/kmyfirewall/kmfwidgets/kmfiptdocoptions.cpp +++ b/kmyfirewall/kmfwidgets/kmfiptdocoptions.cpp @@ -22,8 +22,8 @@ // kde includes #include <kdebug.h> #include <tdeapplication.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> // project includes #include "../core/kmfdoc.h" diff --git a/kmyfirewall/kmfwidgets/kmfipv4addresswidget.cpp b/kmyfirewall/kmfwidgets/kmfipv4addresswidget.cpp index 4dea59e..6e70d11 100644 --- a/kmyfirewall/kmfwidgets/kmfipv4addresswidget.cpp +++ b/kmyfirewall/kmfwidgets/kmfipv4addresswidget.cpp @@ -28,7 +28,7 @@ // KDE includes #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdelistview.h> #include <kcombobox.h> #include <tdepopupmenu.h> diff --git a/kmyfirewall/kmfwidgets/kmflistview.cpp b/kmyfirewall/kmfwidgets/kmflistview.cpp index e0f3809..51e8c12 100644 --- a/kmyfirewall/kmfwidgets/kmflistview.cpp +++ b/kmyfirewall/kmfwidgets/kmflistview.cpp @@ -22,8 +22,8 @@ Author: Christian Hubinger <[email protected]>, (C) 2001-2004 // KDE includes #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdeconfig.h> // Project includes diff --git a/kmyfirewall/kmfwidgets/kmflistviewitem.cpp b/kmyfirewall/kmfwidgets/kmflistviewitem.cpp index 47591f8..47b5dd7 100644 --- a/kmyfirewall/kmfwidgets/kmflistviewitem.cpp +++ b/kmyfirewall/kmfwidgets/kmflistviewitem.cpp @@ -16,9 +16,9 @@ Author: Christian Hubinger <[email protected]>, (C) 2001-2004 // KDE includes #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> -#include <kglobal.h> +#include <tdeglobal.h> // Project includes #include "../core/xmlnames.h" diff --git a/kmyfirewall/kmfwidgets/kmfmynetworkwidget.cpp b/kmyfirewall/kmfwidgets/kmfmynetworkwidget.cpp index bb0484d..15d176a 100644 --- a/kmyfirewall/kmfwidgets/kmfmynetworkwidget.cpp +++ b/kmyfirewall/kmfwidgets/kmfmynetworkwidget.cpp @@ -25,9 +25,9 @@ // KDe Includes #include <ktabwidget.h> #include <kiconloader.h> -#include <klocale.h> -#include <kglobal.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdeglobal.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <tdepopupmenu.h> #include <kinputdialog.h> diff --git a/kmyfirewall/kmfwidgets/kmfmynetworkwidget.h b/kmyfirewall/kmfwidgets/kmfmynetworkwidget.h index 960f85e..737fc30 100644 --- a/kmyfirewall/kmfwidgets/kmfmynetworkwidget.h +++ b/kmyfirewall/kmfwidgets/kmfmynetworkwidget.h @@ -18,7 +18,7 @@ #include <tqwidget.h> #include <kdialogbase.h> #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kprocess.h> #include <tqstring.h> #include <tqpixmap.h> diff --git a/kmyfirewall/kmfwidgets/kmfnethostpropertieswidget.cpp b/kmyfirewall/kmfwidgets/kmfnethostpropertieswidget.cpp index b223fa9..e3cbeb9 100644 --- a/kmyfirewall/kmfwidgets/kmfnethostpropertieswidget.cpp +++ b/kmyfirewall/kmfwidgets/kmfnethostpropertieswidget.cpp @@ -27,7 +27,7 @@ // KDE includes #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdelistview.h> #include <kcombobox.h> #include <tdepopupmenu.h> diff --git a/kmyfirewall/kmfwidgets/kmfnetworkwidget.cpp b/kmyfirewall/kmfwidgets/kmfnetworkwidget.cpp index f540982..12d002f 100644 --- a/kmyfirewall/kmfwidgets/kmfnetworkwidget.cpp +++ b/kmyfirewall/kmfwidgets/kmfnetworkwidget.cpp @@ -19,7 +19,7 @@ // KDE includes #include <kdebug.h> #include <knuminput.h> -#include <klocale.h> +#include <tdelocale.h> // project includes #include "../core/kmfundoengine.h" diff --git a/kmyfirewall/kmfwidgets/kmfobjectinfo.cpp b/kmyfirewall/kmfwidgets/kmfobjectinfo.cpp index 4ff7bfe..3f33a06 100644 --- a/kmyfirewall/kmfwidgets/kmfobjectinfo.cpp +++ b/kmyfirewall/kmfwidgets/kmfobjectinfo.cpp @@ -18,7 +18,7 @@ // KDE Includes #include <kdebug.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> // QT includes #include <tqstring.h> diff --git a/kmyfirewall/kmfwidgets/kmfportwidget.cpp b/kmyfirewall/kmfwidgets/kmfportwidget.cpp index ce63595..96af0da 100644 --- a/kmyfirewall/kmfwidgets/kmfportwidget.cpp +++ b/kmyfirewall/kmfwidgets/kmfportwidget.cpp @@ -21,7 +21,7 @@ #include <tqlabel.h> #include <kcombobox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "../core/kmferror.h" diff --git a/kmyfirewall/kmfwidgets/kmfprocout.cpp b/kmyfirewall/kmfwidgets/kmfprocout.cpp index 1869148..a7d96f1 100644 --- a/kmyfirewall/kmfwidgets/kmfprocout.cpp +++ b/kmyfirewall/kmfwidgets/kmfprocout.cpp @@ -16,7 +16,7 @@ #include "kmfprocout.h" // KDE includes -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kiconloader.h> #include <kstandarddirs.h> diff --git a/kmyfirewall/kmfwidgets/kmfprotocollistview.cpp b/kmyfirewall/kmfwidgets/kmfprotocollistview.cpp index bd0ea6b..beef134 100644 --- a/kmyfirewall/kmfwidgets/kmfprotocollistview.cpp +++ b/kmyfirewall/kmfwidgets/kmfprotocollistview.cpp @@ -28,7 +28,7 @@ // KDE includes #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdelistview.h> #include <kcombobox.h> #include <tdepopupmenu.h> diff --git a/kmyfirewall/kmfwidgets/kmfprotocolpropertieswidget.cpp b/kmyfirewall/kmfwidgets/kmfprotocolpropertieswidget.cpp index 52ebbce..8aae0dc 100644 --- a/kmyfirewall/kmfwidgets/kmfprotocolpropertieswidget.cpp +++ b/kmyfirewall/kmfwidgets/kmfprotocolpropertieswidget.cpp @@ -27,7 +27,7 @@ // KDE includes #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdelistview.h> #include <kcombobox.h> #include <tdepopupmenu.h> diff --git a/kmyfirewall/kmfwidgets/kmfselectactivetarget.cpp b/kmyfirewall/kmfwidgets/kmfselectactivetarget.cpp index 24fb4e1..89bfec0 100644 --- a/kmyfirewall/kmfwidgets/kmfselectactivetarget.cpp +++ b/kmyfirewall/kmfwidgets/kmfselectactivetarget.cpp @@ -32,10 +32,10 @@ #include <tqspinbox.h> // KDE includes -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeio/netaccess.h> #include <tdeio/job.h> #include <ktrader.h> @@ -44,8 +44,8 @@ #include <tdelistbox.h> #include <knuminput.h> #include <kpushbutton.h> -#include <kmessagebox.h> -#include <ktempfile.h> +#include <tdemessagebox.h> +#include <tdetempfile.h> // Project includes #include "kmflistviewitem.h" diff --git a/kmyfirewall/kmfwidgets/kmfselectinterface.cpp b/kmyfirewall/kmfwidgets/kmfselectinterface.cpp index 821e750..4de51cf 100644 --- a/kmyfirewall/kmfwidgets/kmfselectinterface.cpp +++ b/kmyfirewall/kmfwidgets/kmfselectinterface.cpp @@ -22,9 +22,9 @@ #include <kcombobox.h> #include <kpushbutton.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeapplication.h> // Project Includes diff --git a/kmyfirewall/kmfwidgets/kmfsystemsettingslinux.cpp b/kmyfirewall/kmfwidgets/kmfsystemsettingslinux.cpp index 61a711a..bdce312 100644 --- a/kmyfirewall/kmfwidgets/kmfsystemsettingslinux.cpp +++ b/kmyfirewall/kmfwidgets/kmfsystemsettingslinux.cpp @@ -18,11 +18,11 @@ #include <tqlabel.h> // KDE includes -#include <klocale.h> +#include <tdelocale.h> #include <kcombobox.h> #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurlrequester.h> #include <kguiitem.h> #include <kpushbutton.h> @@ -30,8 +30,8 @@ #include <tdelistbox.h> #include <kcombobox.h> #include <kiconloader.h> -#include <kglobal.h> -#include <kmessagebox.h> +#include <tdeglobal.h> +#include <tdemessagebox.h> #include <tdelistview.h> // Prokject includes diff --git a/kmyfirewall/kmfwidgets/kmftemplatechooser.cpp b/kmyfirewall/kmfwidgets/kmftemplatechooser.cpp index b4e7abb..9a5b477 100644 --- a/kmyfirewall/kmfwidgets/kmftemplatechooser.cpp +++ b/kmyfirewall/kmfwidgets/kmftemplatechooser.cpp @@ -21,10 +21,10 @@ // KDE includes #include <kstandarddirs.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdeapplication.h> // project includes diff --git a/kmyfirewall/kmfwidgets/kmftransactionlog.cpp b/kmyfirewall/kmfwidgets/kmftransactionlog.cpp index a4fcb9a..cd957c7 100644 --- a/kmyfirewall/kmfwidgets/kmftransactionlog.cpp +++ b/kmyfirewall/kmfwidgets/kmftransactionlog.cpp @@ -25,12 +25,12 @@ // KDE includes #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kpushbutton.h> #include <tdepopupmenu.h> #include <kprocess.h> -#include <ktempfile.h> +#include <tdetempfile.h> // project includes #include "../core/netfilterobject.h" diff --git a/kmyfirewall/kmyfirewall.cpp b/kmyfirewall/kmyfirewall.cpp index ec7f537..abf7266 100644 --- a/kmyfirewall/kmyfirewall.cpp +++ b/kmyfirewall/kmyfirewall.cpp @@ -29,15 +29,15 @@ Author: Christian Hubinger <[email protected]>, (C) 2001-2004 #include <kstdaction.h> #include <kstandarddirs.h> #include <tdefiledialog.h> -#include <klocale.h> -#include <kmenubar.h> +#include <tdelocale.h> +#include <tdemenubar.h> #include <kprocess.h> #include <kdebug.h> #include <dcopclient.h> #include <kstatusbar.h> #include <tdepopupmenu.h> -#include <kglobal.h> -#include <kmessagebox.h> +#include <tdeglobal.h> +#include <tdemessagebox.h> #include <kstdguiitem.h> #include <tdecmdlineargs.h> #include <tdeio/netaccess.h> diff --git a/kmyfirewall/kmyfirewall.h b/kmyfirewall/kmyfirewall.h index 730bc72..c9dc221 100644 --- a/kmyfirewall/kmyfirewall.h +++ b/kmyfirewall/kmyfirewall.h @@ -31,7 +31,7 @@ Author: Christian Hubinger <[email protected]>, (C) 2001-2004 #include <kurl.h> #include <tdeparts/mainwindow.h> #include <tdeparts/dockmainwindow.h> -#include <ktempfile.h> +#include <tdetempfile.h> // Project includes #include "kmfwidgets/kmfmainwindow.h" diff --git a/kmyfirewall/main.cpp b/kmyfirewall/main.cpp index 88586a9..a43dced 100644 --- a/kmyfirewall/main.cpp +++ b/kmyfirewall/main.cpp @@ -23,7 +23,7 @@ #include <tdecmdlineargs.h> #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <kdebug.h> diff --git a/kmyfirewall/ruleoptionplugins/custom_option/kmfruleeditcustomopt.cpp b/kmyfirewall/ruleoptionplugins/custom_option/kmfruleeditcustomopt.cpp index 0dac974..cfcc28e 100644 --- a/kmyfirewall/ruleoptionplugins/custom_option/kmfruleeditcustomopt.cpp +++ b/kmyfirewall/ruleoptionplugins/custom_option/kmfruleeditcustomopt.cpp @@ -16,7 +16,7 @@ // KDE includes #include <kdebug.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> // QT includes #include <tqpushbutton.h> diff --git a/kmyfirewall/ruleoptionplugins/custom_option/kmfruleoptioneditcustom.cpp b/kmyfirewall/ruleoptionplugins/custom_option/kmfruleoptioneditcustom.cpp index 1b55cef..d61a8a4 100644 --- a/kmyfirewall/ruleoptionplugins/custom_option/kmfruleoptioneditcustom.cpp +++ b/kmyfirewall/ruleoptionplugins/custom_option/kmfruleoptioneditcustom.cpp @@ -30,7 +30,7 @@ // KDE includes #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeparts/genericfactory.h> // Project includes @@ -93,7 +93,7 @@ TQWidget* KMFRuleOptionEditCustom::editWidget() { // It's usually safe to leave the factory code alone.. with the // notable exception of the TDEAboutData data #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> // // TDEInstance* KMFRuleOptionEditCustomFactory::s_instance = 0L; // // TDEAboutData* KMFRuleOptionEditCustomFactory::s_about = 0L; diff --git a/kmyfirewall/ruleoptionplugins/interface_option/kmfruleeditorinterface.cpp b/kmyfirewall/ruleoptionplugins/interface_option/kmfruleeditorinterface.cpp index 76ffacb..c117da0 100644 --- a/kmyfirewall/ruleoptionplugins/interface_option/kmfruleeditorinterface.cpp +++ b/kmyfirewall/ruleoptionplugins/interface_option/kmfruleeditorinterface.cpp @@ -29,7 +29,7 @@ #include <tdeconfig.h> #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> // project include #include "../../core/iptrule.h" diff --git a/kmyfirewall/ruleoptionplugins/interface_option/kmfruleoptioneditinterface.cpp b/kmyfirewall/ruleoptionplugins/interface_option/kmfruleoptioneditinterface.cpp index 4c6a004..65df851 100644 --- a/kmyfirewall/ruleoptionplugins/interface_option/kmfruleoptioneditinterface.cpp +++ b/kmyfirewall/ruleoptionplugins/interface_option/kmfruleoptioneditinterface.cpp @@ -17,7 +17,7 @@ // KDE includes #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> // Project includes #include "../../core/iptrule.h" @@ -83,7 +83,7 @@ TQWidget* KMFRuleOptionEditorInterface::editWidget() { // It's usually safe to leave the factory code alone.. with the // notable exception of the TDEAboutData data #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> // TDEInstance* KMFRuleOptionEditorInterfaceFactory::s_instance = 0L; // TDEAboutData* KMFRuleOptionEditorInterfaceFactory::s_about = 0L; diff --git a/kmyfirewall/ruleoptionplugins/ip_option/kmfruleeditip.cpp b/kmyfirewall/ruleoptionplugins/ip_option/kmfruleeditip.cpp index 55c0fa4..ebd4e79 100644 --- a/kmyfirewall/ruleoptionplugins/ip_option/kmfruleeditip.cpp +++ b/kmyfirewall/ruleoptionplugins/ip_option/kmfruleeditip.cpp @@ -26,7 +26,7 @@ Author: Christian Hubinger <[email protected]>, (C) 2001-2004 // KDE includes #include <kdebug.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> // project includes #include "../../core/xmlnames.h" diff --git a/kmyfirewall/ruleoptionplugins/ip_option/kmfruleoptioneditip.cpp b/kmyfirewall/ruleoptionplugins/ip_option/kmfruleoptioneditip.cpp index 2bc0b6a..f425cb8 100644 --- a/kmyfirewall/ruleoptionplugins/ip_option/kmfruleoptioneditip.cpp +++ b/kmyfirewall/ruleoptionplugins/ip_option/kmfruleoptioneditip.cpp @@ -29,7 +29,7 @@ // KDE includes #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> // Project includes #include "../../core/iptrule.h" @@ -91,7 +91,7 @@ TQWidget* KMFRuleOptionEditIP::editWidget() { // It's usually safe to leave the factory code alone.. with the // notable exception of the TDEAboutData data #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> // TDEInstance* KMFRuleOptionEditIPFactory::s_instance = 0L; // TDEAboutData* KMFRuleOptionEditIPFactory::s_about = 0L; diff --git a/kmyfirewall/ruleoptionplugins/limit_option/kmfruleeditorlimit.cpp b/kmyfirewall/ruleoptionplugins/limit_option/kmfruleeditorlimit.cpp index 8919e73..151745f 100644 --- a/kmyfirewall/ruleoptionplugins/limit_option/kmfruleeditorlimit.cpp +++ b/kmyfirewall/ruleoptionplugins/limit_option/kmfruleeditorlimit.cpp @@ -23,10 +23,10 @@ #include <tqcheckbox.h> // kde includes -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeapplication.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> // Project includes #include "../../core/iptruleoption.h" diff --git a/kmyfirewall/ruleoptionplugins/limit_option/kmfruleoptioneditlimit.cpp b/kmyfirewall/ruleoptionplugins/limit_option/kmfruleoptioneditlimit.cpp index a744463..47b00a2 100644 --- a/kmyfirewall/ruleoptionplugins/limit_option/kmfruleoptioneditlimit.cpp +++ b/kmyfirewall/ruleoptionplugins/limit_option/kmfruleoptioneditlimit.cpp @@ -29,7 +29,7 @@ // KDE includes #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> // Project includes #include "../../core/iptrule.h" @@ -93,7 +93,7 @@ TQWidget* KMFRuleOptionEditLimit::editWidget() { // It's usually safe to leave the factory code alone.. with the // notable exception of the TDEAboutData data #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> // TDEInstance* KMFRuleOptionEditLimitFactory::s_instance = 0L; // TDEAboutData* KMFRuleOptionEditLimitFactory::s_about = 0L; diff --git a/kmyfirewall/ruleoptionplugins/log_target_option/kmfruleedittargetlog.cpp b/kmyfirewall/ruleoptionplugins/log_target_option/kmfruleedittargetlog.cpp index e098348..a2ca07a 100644 --- a/kmyfirewall/ruleoptionplugins/log_target_option/kmfruleedittargetlog.cpp +++ b/kmyfirewall/ruleoptionplugins/log_target_option/kmfruleedittargetlog.cpp @@ -24,7 +24,7 @@ // kde includes #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> // MY includes #include "../../core/xmlnames.h" diff --git a/kmyfirewall/ruleoptionplugins/log_target_option/kmfruletargetoptioneditlog.cpp b/kmyfirewall/ruleoptionplugins/log_target_option/kmfruletargetoptioneditlog.cpp index 04bd750..cb67a68 100644 --- a/kmyfirewall/ruleoptionplugins/log_target_option/kmfruletargetoptioneditlog.cpp +++ b/kmyfirewall/ruleoptionplugins/log_target_option/kmfruletargetoptioneditlog.cpp @@ -17,7 +17,7 @@ // KDE includes #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> // Project includes #include "../../core/iptrule.h" @@ -89,7 +89,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 <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> // TDEInstance* KMFRuleTargetOptionEditLogFactory::s_instance = 0L; // TDEAboutData* KMFRuleTargetOptionEditLogFactory::s_about = 0L; diff --git a/kmyfirewall/ruleoptionplugins/mac_option/kmfruleeditmac.cpp b/kmyfirewall/ruleoptionplugins/mac_option/kmfruleeditmac.cpp index 68ce41d..471fe1b 100644 --- a/kmyfirewall/ruleoptionplugins/mac_option/kmfruleeditmac.cpp +++ b/kmyfirewall/ruleoptionplugins/mac_option/kmfruleeditmac.cpp @@ -23,8 +23,8 @@ Author: Christian Hubinger <[email protected]>, (C) 2001-2004 #include <tqwhatsthis.h> #include <kdebug.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <tdeapplication.h> // project includes diff --git a/kmyfirewall/ruleoptionplugins/mac_option/kmfruleoptioneditmac.cpp b/kmyfirewall/ruleoptionplugins/mac_option/kmfruleoptioneditmac.cpp index 3aebafd..2ce9bf1 100644 --- a/kmyfirewall/ruleoptionplugins/mac_option/kmfruleoptioneditmac.cpp +++ b/kmyfirewall/ruleoptionplugins/mac_option/kmfruleoptioneditmac.cpp @@ -18,7 +18,7 @@ // KDE includes #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> // Project includes #include "../../core/iptrule.h" @@ -81,7 +81,7 @@ TQWidget* KMFRuleOptionEditMAC::editWidget() { // It's usually safe to leave the factory code alone.. with the // notable exception of the TDEAboutData data #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> // TDEInstance* KMFRuleOptionEditMACFactory::s_instance = 0L; // TDEAboutData* KMFRuleOptionEditMACFactory::s_about = 0L; diff --git a/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruleedittargetmark.cpp b/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruleedittargetmark.cpp index b5e81e5..d57cadc 100644 --- a/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruleedittargetmark.cpp +++ b/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruleedittargetmark.cpp @@ -22,7 +22,7 @@ // KDE includes #include <kdebug.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> // MY includes #include "../../core/xmlnames.h" diff --git a/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptioneditmark.cpp b/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptioneditmark.cpp index c9e530c..2d55278 100644 --- a/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptioneditmark.cpp +++ b/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptioneditmark.cpp @@ -17,7 +17,7 @@ // KDE includes #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> // Project includes #include "../../core/iptrule.h" @@ -94,7 +94,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 <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> // TDEInstance* KMFRuleTargetOptionEditMarkFactory::s_instance = 0L; // TDEAboutData* KMFRuleTargetOptionEditMarkFactory::s_about = 0L; diff --git a/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruleeditortargetnat.cpp b/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruleeditortargetnat.cpp index 78f64e3..aae5ece 100644 --- a/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruleeditortargetnat.cpp +++ b/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruleeditortargetnat.cpp @@ -24,9 +24,9 @@ email : [email protected] // KDE include #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> // MY includes #include "../../core/xmlnames.h" diff --git a/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruletargetoptioneditnat.cpp b/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruletargetoptioneditnat.cpp index cc67773..c6acd75 100644 --- a/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruletargetoptioneditnat.cpp +++ b/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruletargetoptioneditnat.cpp @@ -29,7 +29,7 @@ // KDE includes #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> // Project includes #include "../../core/iptrule.h" @@ -106,7 +106,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 <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> // TDEInstance* KMFRuleTargetOptionEditNatFactory::s_instance = 0L; // TDEAboutData* KMFRuleTargetOptionEditNatFactory::s_about = 0L; diff --git a/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleeditorprotocol.cpp b/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleeditorprotocol.cpp index 1737ac6..e36a453 100644 --- a/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleeditorprotocol.cpp +++ b/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleeditorprotocol.cpp @@ -17,8 +17,8 @@ // kde includes #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdeapplication.h> // qt includes diff --git a/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoptioneditprotocol.cpp b/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoptioneditprotocol.cpp index 0b11260..c0f851a 100644 --- a/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoptioneditprotocol.cpp +++ b/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoptioneditprotocol.cpp @@ -29,7 +29,7 @@ // KDE includes #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> // Project includes #include "../../core/iptrule.h" @@ -96,7 +96,7 @@ TQWidget* KMFRuleOptionEditProtocol::editWidget() { // It's usually safe to leave the factory code alone.. with the // notable exception of the TDEAboutData data #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> // TDEInstance* KMFRuleOptionEditProtocolFactory::s_instance = 0L; // TDEAboutData* KMFRuleOptionEditProtocolFactory::s_about = 0L; diff --git a/kmyfirewall/ruleoptionplugins/state_option/kmfruleeditorstate.cpp b/kmyfirewall/ruleoptionplugins/state_option/kmfruleeditorstate.cpp index 090b276..6da191e 100644 --- a/kmyfirewall/ruleoptionplugins/state_option/kmfruleeditorstate.cpp +++ b/kmyfirewall/ruleoptionplugins/state_option/kmfruleeditorstate.cpp @@ -23,9 +23,9 @@ // kde includes #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> // ProjectIncludes #include "../../core/xmlnames.h" diff --git a/kmyfirewall/ruleoptionplugins/state_option/kmfruleoptioneditstate.cpp b/kmyfirewall/ruleoptionplugins/state_option/kmfruleoptioneditstate.cpp index d62152f..de383c9 100644 --- a/kmyfirewall/ruleoptionplugins/state_option/kmfruleoptioneditstate.cpp +++ b/kmyfirewall/ruleoptionplugins/state_option/kmfruleoptioneditstate.cpp @@ -29,7 +29,7 @@ // KDE includes #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> // Project includes #include "../../core/iptrule.h" @@ -89,7 +89,7 @@ TQWidget* KMFRuleOptionEditState::editWidget() { // It's usually safe to leave the factory code alone.. with the // notable exception of the TDEAboutData data #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> // TDEInstance* KMFRuleOptionEditStateFactory::s_instance = 0L; // TDEAboutData* KMFRuleOptionEditStateFactory::s_about = 0L; diff --git a/kmyfirewall/ruleoptionplugins/tos_option/kmfruleeditortos.cpp b/kmyfirewall/ruleoptionplugins/tos_option/kmfruleeditortos.cpp index 9d61ba5..75b1186 100644 --- a/kmyfirewall/ruleoptionplugins/tos_option/kmfruleeditortos.cpp +++ b/kmyfirewall/ruleoptionplugins/tos_option/kmfruleeditortos.cpp @@ -23,7 +23,7 @@ #include <tqgroupbox.h> // kde includes -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeapplication.h> diff --git a/kmyfirewall/ruleoptionplugins/tos_option/kmfruleoptionedittos.cpp b/kmyfirewall/ruleoptionplugins/tos_option/kmfruleoptionedittos.cpp index 44e42c6..fc083ab 100644 --- a/kmyfirewall/ruleoptionplugins/tos_option/kmfruleoptionedittos.cpp +++ b/kmyfirewall/ruleoptionplugins/tos_option/kmfruleoptionedittos.cpp @@ -29,7 +29,7 @@ // KDE includes #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> // Project includes #include "../../core/iptrule.h" @@ -94,7 +94,7 @@ TQWidget* KMFRuleOptionEditTos::editWidget() { // It's usually safe to leave the factory code alone.. with the // notable exception of the TDEAboutData data #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> // TDEInstance* KMFRuleOptionEditTosFactory::s_instance = 0L; // TDEAboutData* KMFRuleOptionEditTosFactory::s_about = 0L; diff --git a/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruleeditortos.cpp b/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruleeditortos.cpp index 612069d..ec0242c 100644 --- a/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruleeditortos.cpp +++ b/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruleeditortos.cpp @@ -23,7 +23,7 @@ #include <tqgroupbox.h> // kde includes -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeapplication.h> diff --git a/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruletargetoptionedittos.cpp b/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruletargetoptionedittos.cpp index cdb10d0..fd8d318 100644 --- a/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruletargetoptionedittos.cpp +++ b/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruletargetoptionedittos.cpp @@ -17,7 +17,7 @@ // KDE includes #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> // Project includes #include "../../core/iptrule.h" @@ -93,7 +93,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 <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> // TDEInstance* KMFRuleTargetOptionEditTosFactory::s_instance = 0L; // TDEAboutData* KMFRuleTargetOptionEditTosFactory::s_about = 0L; |