summaryrefslogtreecommitdiffstats
path: root/kicker-applets/kolourpicker/kolourpicker.cpp
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.cpp
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.cpp')
-rw-r--r--kicker-applets/kolourpicker/kolourpicker.cpp6
1 files changed, 3 insertions, 3 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");