summaryrefslogtreecommitdiffstats
path: root/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoptioneditprotocol.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 19:53:21 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 19:53:21 -0600
commit8cd2c9398a5402112d19aae3b24f75b6772f5e26 (patch)
tree6ce44bca8dba76a3fb3c98d21627c3c94a1056b1 /kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoptioneditprotocol.h
parent3b22097ebecc1d10c4cc1d89c99aefc2abae0d63 (diff)
downloadkmyfirewall-8cd2c9398a5402112d19aae3b24f75b6772f5e26.tar.gz
kmyfirewall-8cd2c9398a5402112d19aae3b24f75b6772f5e26.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoptioneditprotocol.h')
-rw-r--r--kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoptioneditprotocol.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoptioneditprotocol.h b/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoptioneditprotocol.h
index 2055694..36834f8 100644
--- a/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoptioneditprotocol.h
+++ b/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoptioneditprotocol.h
@@ -32,7 +32,7 @@
#include <kparts/factory.h>
#include <kxmlgui.h>
-class KInstance;
+class TDEInstance;
namespace KMF {
class IPTRule;
@@ -74,10 +74,10 @@ public:
virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0,
const char* name = TQOBJECT_OBJECT_NAME_STRING,
const TQStringList &args = TQStringList() );
- /* static KInstance* instance(); */
+ /* static TDEInstance* instance(); */
/*private:
- static KInstance* s_instance;*/
+ static TDEInstance* s_instance;*/
};
}