diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:53:21 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:53:21 -0600 |
commit | 8cd2c9398a5402112d19aae3b24f75b6772f5e26 (patch) | |
tree | 6ce44bca8dba76a3fb3c98d21627c3c94a1056b1 /kmyfirewall/ruleoptionplugins/mark_target_option | |
parent | 3b22097ebecc1d10c4cc1d89c99aefc2abae0d63 (diff) | |
download | kmyfirewall-8cd2c939.tar.gz kmyfirewall-8cd2c939.zip |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kmyfirewall/ruleoptionplugins/mark_target_option')
-rw-r--r-- | kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptioneditmark.cpp | 12 | ||||
-rw-r--r-- | kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptioneditmark.h | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptioneditmark.cpp b/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptioneditmark.cpp index a3909a8..7da315a 100644 --- a/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptioneditmark.cpp +++ b/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptioneditmark.cpp @@ -92,16 +92,16 @@ bool KMFRuleTargetOptionEditMark::setTarget( const TQString& target ){ // It's usually safe to leave the factory code alone.. with the -// notable exception of the KAboutData data +// notable exception of the TDEAboutData data #include <kaboutdata.h> #include <klocale.h> -// KInstance* KMFRuleTargetOptionEditMarkFactory::s_instance = 0L; -// KAboutData* KMFRuleTargetOptionEditMarkFactory::s_about = 0L; +// TDEInstance* KMFRuleTargetOptionEditMarkFactory::s_instance = 0L; +// TDEAboutData* KMFRuleTargetOptionEditMarkFactory::s_about = 0L; KMFRuleTargetOptionEditMarkFactory::KMFRuleTargetOptionEditMarkFactory( TQObject* parent, const char* name ) : KLibFactory( parent, name ) { -// s_instance = new KInstance( "KMFRuleTargetOptionEditMarkFactory" ); +// s_instance = new TDEInstance( "KMFRuleTargetOptionEditMarkFactory" ); } TQObject* KMFRuleTargetOptionEditMarkFactory::createObject( TQObject* parent, const char* name, @@ -112,9 +112,9 @@ TQObject* KMFRuleTargetOptionEditMarkFactory::createObject( TQObject* parent, co } -// KInstance* KMFRuleTargetOptionEditMarkFactory::instance() { +// TDEInstance* KMFRuleTargetOptionEditMarkFactory::instance() { // if ( !s_instance ) { -// s_instance = new KInstance( "KMFRuleTargetOptionEditMarkFactory" ); +// s_instance = new TDEInstance( "KMFRuleTargetOptionEditMarkFactory" ); // } // return s_instance; // } diff --git a/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptioneditmark.h b/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptioneditmark.h index 6a71bc9..9180cf8 100644 --- a/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptioneditmark.h +++ b/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptioneditmark.h @@ -19,7 +19,7 @@ #include <kparts/plugin.h> #include <kparts/factory.h> #include <kxmlgui.h> -class KInstance; +class TDEInstance; namespace KMF { @@ -64,10 +64,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;*/ }; } |