summaryrefslogtreecommitdiffstats
path: root/kicker-applets/mediacontrol/mediacontrol.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:13:30 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:13:30 -0600
commit609724b5d29f25236bee59d0cb794602d391a96b (patch)
tree6a7cbc4d42a570e50e44ad782d9bc6cdee289edb /kicker-applets/mediacontrol/mediacontrol.h
parentda2af448849a961235925b69430584d0bfe94b1f (diff)
downloadtdeaddons-609724b5d29f25236bee59d0cb794602d391a96b.tar.gz
tdeaddons-609724b5d29f25236bee59d0cb794602d391a96b.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kicker-applets/mediacontrol/mediacontrol.h')
-rw-r--r--kicker-applets/mediacontrol/mediacontrol.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/kicker-applets/mediacontrol/mediacontrol.h b/kicker-applets/mediacontrol/mediacontrol.h
index 4c98787..0704da5 100644
--- a/kicker-applets/mediacontrol/mediacontrol.h
+++ b/kicker-applets/mediacontrol/mediacontrol.h
@@ -43,9 +43,9 @@
class MCSlider;
class KPopupMenu;
-class KInstance;
+class TDEInstance;
class MediaControlConfig;
-class KAboutData;
+class TDEAboutData;
class MediaControlToolTip;
// =============================================================================
@@ -84,8 +84,8 @@ class MediaControl : public KPanelApplet, virtual public MediaControlIface
void reportBug();
private:
- KInstance *mInstance;
- KAboutData *mAboutData;
+ TDEInstance *mInstance;
+ TDEAboutData *mAboutData;
DCOPClient *_dcopClient;
PlayerInterface *_player;
ConfigFrontend *_configFrontend;