diff options
author | Timothy Pearson <[email protected]> | 2013-01-22 19:53:16 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-22 19:53:16 -0600 |
commit | 0bb16222af363e31a5b825789203461556703bdd (patch) | |
tree | ff52756dbe25cd3e44e2fb79cd2ee4de2239dd51 /src/kmplayer_koffice_part.cpp | |
parent | f6107ad4646372ea0c8a517fbe91c0c2786513ea (diff) | |
download | kmplayer-0bb16222af363e31a5b825789203461556703bdd.tar.gz kmplayer-0bb16222af363e31a5b825789203461556703bdd.zip |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'src/kmplayer_koffice_part.cpp')
-rw-r--r-- | src/kmplayer_koffice_part.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/kmplayer_koffice_part.cpp b/src/kmplayer_koffice_part.cpp index c32e829..76dc11f 100644 --- a/src/kmplayer_koffice_part.cpp +++ b/src/kmplayer_koffice_part.cpp @@ -62,17 +62,17 @@ public: virtual KParts::Part *createPartObject (TQWidget *wparent, const char *wname, TQObject *parent, const char *name, const char *className, const TQStringList &args); - static KInstance * instance () { return s_instance; } + static TDEInstance * instance () { return s_instance; } private: - static KInstance * s_instance; + static TDEInstance * s_instance; }; K_EXPORT_COMPONENT_FACTORY (libkmplayerkofficepart, KMPlayerFactory) -KInstance *KMPlayerFactory::s_instance = 0; +TDEInstance *KMPlayerFactory::s_instance = 0; KMPlayerFactory::KMPlayerFactory () { - s_instance = new KInstance ("KMPlayerKofficePart"); + s_instance = new TDEInstance ("KMPlayerKofficePart"); } KMPlayerFactory::~KMPlayerFactory () { |