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/kmplayerpartbase.h | |
| parent | f6107ad4646372ea0c8a517fbe91c0c2786513ea (diff) | |
| download | kmplayer-0bb16222af363e31a5b825789203461556703bdd.tar.gz kmplayer-0bb16222af363e31a5b825789203461556703bdd.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'src/kmplayerpartbase.h')
| -rw-r--r-- | src/kmplayerpartbase.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/kmplayerpartbase.h b/src/kmplayerpartbase.h index bf2fbde..ee53ba9 100644 --- a/src/kmplayerpartbase.h +++ b/src/kmplayerpartbase.h @@ -36,8 +36,8 @@ #include "kmplayersource.h" -class KAboutData; -class KInstance; +class TDEAboutData; +class TDEInstance; class KActionCollection; class KBookmarkMenu; class KConfig; @@ -122,7 +122,7 @@ public: ~PartBase (); void init (KActionCollection * = 0L); virtual KMediaPlayer::View* view (); - static KAboutData* createAboutData (); + static TDEAboutData* createAboutData (); Settings * settings () const { return m_settings; } void keepMovieAspect (bool); |