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/kolourpicker/kolourpicker.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

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