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/genericinterface/kmfgenericinterface_part.h | |
| parent | 3b22097ebecc1d10c4cc1d89c99aefc2abae0d63 (diff) | |
| download | kmyfirewall-8cd2c9398a5402112d19aae3b24f75b6772f5e26.tar.gz kmyfirewall-8cd2c9398a5402112d19aae3b24f75b6772f5e26.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kmyfirewall/genericinterface/kmfgenericinterface_part.h')
| -rw-r--r-- | kmyfirewall/genericinterface/kmfgenericinterface_part.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kmyfirewall/genericinterface/kmfgenericinterface_part.h b/kmyfirewall/genericinterface/kmfgenericinterface_part.h index e72be94..4c3ac8a 100644 --- a/kmyfirewall/genericinterface/kmfgenericinterface_part.h +++ b/kmyfirewall/genericinterface/kmfgenericinterface_part.h @@ -18,8 +18,8 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001 #include <kparts/part.h> #include <kparts/factory.h> -class KInstance; -class KAboutData; +class TDEInstance; +class TDEAboutData; class TQLabel; class KAction; class KActionMenu; @@ -36,7 +36,7 @@ public: char *nameOb, const TQStringList & /*args*/ ); virtual ~KMFGenericInterfacePart(); - static KAboutData *createAboutData(); + static TDEAboutData *createAboutData(); /** * This is a virtual function inherited from KParts::ReadWritePart. @@ -101,11 +101,11 @@ public: virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname, const TQStringList &args ); - static KInstance* instance(); + static TDEInstance* instance(); private: - static KInstance* s_instance; - static KAboutData* s_about; + static TDEInstance* s_instance; + static TDEAboutData* s_about; }; } #endif |