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 /kmid/kmid_part.h | |
| parent | ce8519b39b2aeaf3ef667afced239d5a4643ef72 (diff) | |
| download | tdemultimedia-fcd5041fd6bf0cea48980d8a035468b2cdb5fff2.tar.gz tdemultimedia-fcd5041fd6bf0cea48980d8a035468b2cdb5fff2.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kmid/kmid_part.h')
| -rw-r--r-- | kmid/kmid_part.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kmid/kmid_part.h b/kmid/kmid_part.h index c6dc170a..7e26ae14 100644 --- a/kmid/kmid_part.h +++ b/kmid/kmid_part.h @@ -4,8 +4,8 @@ #include <kparts/browserextension.h> #include <kparts/factory.h> #include <tdelibs_export.h> -class KAboutData; -class KInstance; +class TDEAboutData; +class TDEInstance; class KMidBrowserExtension; class kmidClient; @@ -22,11 +22,11 @@ class KDE_EXPORT KMidFactory : public KParts::Factory const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList()); - static KInstance *instance(); + static TDEInstance *instance(); - static KAboutData *aboutData(); + static TDEAboutData *aboutData(); private: - static KInstance *s_instance; + static TDEInstance *s_instance; }; class KMidPart: public KParts::ReadOnlyPart |