Rename KInstance and KAboutData to avoid conflicts with KDE4

2 files changed, 7 insertions, 7 deletions

diff --git a/kicker-applets/mediacontrol/mediacontrol.cpp b/kicker-applets/mediacontrol/mediacontrol.cpp
index 95cf81c..99c79c6 100644
--- a/kicker-applets/mediacontrol/mediacontrol.cpp
+++ b/kicker-applets/mediacontrol/mediacontrol.cpp
@@ -94,12 +94,12 @@ MediaControl::MediaControl(const TQString &configFile, Type t, int actions,
 	TQWidget *parent, const char *name)
 	: DCOPObject("MediaControl"),
 		KPanelApplet(configFile, t, actions, parent, name),
-		mInstance(new KInstance("mediacontrol")),
-		mAboutData(new KAboutData("mediacontrol",
+		mInstance(new TDEInstance("mediacontrol")),
+		mAboutData(new TDEAboutData("mediacontrol",
 			I18N_NOOP("MediaControl"),
 			MEDIACONTROL_VERSION,
 			I18N_NOOP("A small control-applet for various media players"),
-			KAboutData::License_GPL_V2,
+			TDEAboutData::License_GPL_V2,
 			"(c) 2001-2004 Stefan Gehn",
 			0,
 			"http://metz.gehn.net"))
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;