Rename additional header files to avoid conflicts with KDE4

24 files changed, 41 insertions, 41 deletions

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 <chubinger@irrsinnig.org>, (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 <chubinger@irrsinnig.org>, (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                : chubinger@irrsinnig.org
 
 // 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;