From f4d08767799d812ea905925bef99faa5fd3d6321 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 15 Feb 2013 21:46:39 -0600 Subject: Rename additional header files to avoid conflicts with KDE4 --- kmyfirewall/ruleoptionplugins/custom_option/kmfruleeditcustomopt.cpp | 2 +- .../ruleoptionplugins/custom_option/kmfruleoptioneditcustom.cpp | 4 ++-- .../ruleoptionplugins/interface_option/kmfruleeditorinterface.cpp | 2 +- .../ruleoptionplugins/interface_option/kmfruleoptioneditinterface.cpp | 4 ++-- kmyfirewall/ruleoptionplugins/ip_option/kmfruleeditip.cpp | 2 +- kmyfirewall/ruleoptionplugins/ip_option/kmfruleoptioneditip.cpp | 4 ++-- kmyfirewall/ruleoptionplugins/limit_option/kmfruleeditorlimit.cpp | 4 ++-- kmyfirewall/ruleoptionplugins/limit_option/kmfruleoptioneditlimit.cpp | 4 ++-- .../ruleoptionplugins/log_target_option/kmfruleedittargetlog.cpp | 2 +- .../log_target_option/kmfruletargetoptioneditlog.cpp | 4 ++-- kmyfirewall/ruleoptionplugins/mac_option/kmfruleeditmac.cpp | 4 ++-- kmyfirewall/ruleoptionplugins/mac_option/kmfruleoptioneditmac.cpp | 4 ++-- .../ruleoptionplugins/mark_target_option/kmfruleedittargetmark.cpp | 2 +- .../mark_target_option/kmfruletargetoptioneditmark.cpp | 4 ++-- .../ruleoptionplugins/nat_target_option/kmfruleeditortargetnat.cpp | 4 ++-- .../nat_target_option/kmfruletargetoptioneditnat.cpp | 4 ++-- .../ruleoptionplugins/protocol_option/kmfruleeditorprotocol.cpp | 4 ++-- .../ruleoptionplugins/protocol_option/kmfruleoptioneditprotocol.cpp | 4 ++-- kmyfirewall/ruleoptionplugins/state_option/kmfruleeditorstate.cpp | 4 ++-- kmyfirewall/ruleoptionplugins/state_option/kmfruleoptioneditstate.cpp | 4 ++-- kmyfirewall/ruleoptionplugins/tos_option/kmfruleeditortos.cpp | 2 +- kmyfirewall/ruleoptionplugins/tos_option/kmfruleoptionedittos.cpp | 4 ++-- kmyfirewall/ruleoptionplugins/tos_target_option/kmfruleeditortos.cpp | 2 +- .../tos_target_option/kmfruletargetoptionedittos.cpp | 4 ++-- 24 files changed, 41 insertions(+), 41 deletions(-) (limited to 'kmyfirewall/ruleoptionplugins') 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 #include -#include +#include // QT includes #include 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 -#include +#include #include // 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 -#include +#include // // 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 #include #include -#include +#include // 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 -#include +#include // 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 -#include +#include // 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 , (C) 2001-2004 // KDE includes #include #include -#include +#include // 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 -#include +#include // 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 -#include +#include // 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 // kde includes -#include +#include #include #include -#include +#include // 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 -#include +#include // 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 -#include +#include // 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 #include -#include +#include // 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 -#include +#include // 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 -#include +#include // 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 , (C) 2001-2004 #include #include -#include -#include +#include +#include #include // 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 -#include +#include // 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 -#include +#include // 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 #include -#include +#include // 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 -#include +#include // 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 -#include +#include // 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 -#include +#include #include -#include +#include // 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 -#include +#include // 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 -#include +#include // 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 -#include -#include +#include +#include #include // 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 -#include +#include // 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 -#include +#include // 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 -#include +#include #include -#include +#include // 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 -#include +#include // 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 -#include +#include // 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 // kde includes -#include +#include #include #include 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 -#include +#include // 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 -#include +#include // 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 // kde includes -#include +#include #include #include 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 -#include +#include // 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 -#include +#include // TDEInstance* KMFRuleTargetOptionEditTosFactory::s_instance = 0L; // TDEAboutData* KMFRuleTargetOptionEditTosFactory::s_about = 0L; -- cgit v1.2.3