diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:20:31 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:20:31 -0600 |
| commit | fcd5041fd6bf0cea48980d8a035468b2cdb5fff2 (patch) | |
| tree | aa0c8d74da1f6fbe13337d07bdf046ef3df80e35 /kaboodle/kaboodle_factory.h | |
| parent | ce8519b39b2aeaf3ef667afced239d5a4643ef72 (diff) | |
| download | tdemultimedia-fcd5041fd6bf0cea48980d8a035468b2cdb5fff2.tar.gz tdemultimedia-fcd5041fd6bf0cea48980d8a035468b2cdb5fff2.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kaboodle/kaboodle_factory.h')
| -rw-r--r-- | kaboodle/kaboodle_factory.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kaboodle/kaboodle_factory.h b/kaboodle/kaboodle_factory.h index 5ee0a1dc..7a85afb8 100644 --- a/kaboodle/kaboodle_factory.h +++ b/kaboodle/kaboodle_factory.h @@ -43,12 +43,12 @@ public: virtual KParts::Part *createPartObject(TQWidget *widgetParent, const char *widgetName, TQObject *parent = 0, const char *name = 0, const char *classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList()); - static const KAboutData *aboutData(); - static KInstance *instance(); + static const TDEAboutData *aboutData(); + static TDEInstance *instance(); private: - static KInstance *s_instance; - static KAboutData *s_aboutData; + static TDEInstance *s_instance; + static TDEAboutData *s_aboutData; }; } |