From 609724b5d29f25236bee59d0cb794602d391a96b Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 22 Jan 2013 20:13:30 -0600
Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4

---
 kicker-applets/mediacontrol/mediacontrol.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'kicker-applets/mediacontrol/mediacontrol.h')

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;
-- 
cgit v1.2.1