Rename KInstance and KAboutData to avoid conflicts with KDE4

4 files changed, 12 insertions, 12 deletions

diff --git a/kicker-applets/kolourpicker/kolourpicker.cpp b/kicker-applets/kolourpicker/kolourpicker.cpp
index b727446..a51229e 100644
--- a/kicker-applets/kolourpicker/kolourpicker.cpp
+++ b/kicker-applets/kolourpicker/kolourpicker.cpp
@@ -62,14 +62,14 @@ KolourPicker::KolourPicker(const TQString& configFile, Type type,
 	: KPanelApplet(configFile, type, actions, parent, name),
 	  m_picking(0)
 {
-	KAboutData *about = new KAboutData("kolourpicker",
+	TDEAboutData *about = new TDEAboutData("kolourpicker",
 									   I18N_NOOP("Color Picker"),
 									   "v0.1",
 									   I18N_NOOP("An applet to pick color values from anywhere on the screen"),
-									   KAboutData::License_GPL_V2,
+									   TDEAboutData::License_GPL_V2,
 									   "(c) 2001 Malte Starostik");
 	about->addAuthor("Malte Starostik", I18N_NOOP("Original Author"), "malte@kde.org");
-	m_instance = new KInstance(about);
+	m_instance = new TDEInstance(about);
 
 	KConfig *conf = config();
 	conf->setGroup("General");
diff --git a/kicker-applets/kolourpicker/kolourpicker.h b/kicker-applets/kolourpicker/kolourpicker.h
index 09bbdc5..af160e7 100644
--- a/kicker-applets/kolourpicker/kolourpicker.h
+++ b/kicker-applets/kolourpicker/kolourpicker.h
@@ -28,7 +28,7 @@
 
 #include "simplebutton.h"
 
-class KInstance;
+class TDEInstance;
 class TQPopupMenu;
 
 class KolourPicker : public KPanelApplet
@@ -59,7 +59,7 @@ private:
 	void arrangeButtons();
 	void setClipboard(const TQString& text);
 
-	KInstance *m_instance;
+	TDEInstance *m_instance;
 	bool m_picking;
 	SimpleButton *m_historyButton, *m_colourButton;
 	TQValueList<TQColor> m_history;
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;