summaryrefslogtreecommitdiffstats
path: root/kicker-applets/kolourpicker/kolourpicker.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/kolourpicker/kolourpicker.h
parentda2af448849a961235925b69430584d0bfe94b1f (diff)
downloadtdeaddons-609724b5d29f25236bee59d0cb794602d391a96b.tar.gz
tdeaddons-609724b5d29f25236bee59d0cb794602d391a96b.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kicker-applets/kolourpicker/kolourpicker.h')
-rw-r--r--kicker-applets/kolourpicker/kolourpicker.h4
1 files changed, 2 insertions, 2 deletions
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;