diff options
| author | Timothy Pearson <[email protected]> | 2013-01-22 20:13:30 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-22 20:13:30 -0600 |
| commit | 609724b5d29f25236bee59d0cb794602d391a96b (patch) | |
| tree | 6a7cbc4d42a570e50e44ad782d9bc6cdee289edb /kicker-applets/kolourpicker | |
| parent | da2af448849a961235925b69430584d0bfe94b1f (diff) | |
| download | tdeaddons-609724b5d29f25236bee59d0cb794602d391a96b.tar.gz tdeaddons-609724b5d29f25236bee59d0cb794602d391a96b.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kicker-applets/kolourpicker')
| -rw-r--r-- | kicker-applets/kolourpicker/kolourpicker.cpp | 6 | ||||
| -rw-r--r-- | kicker-applets/kolourpicker/kolourpicker.h | 4 |
2 files changed, 5 insertions, 5 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"), "[email protected]"); - 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; |