diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:40:51 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:40:51 -0600 |
| commit | 4c097708c4cc24f3b8e4c21f14644f5715767d47 (patch) | |
| tree | e8ca4b1d3a3b3de0d18e5f144dcef9b36f830b84 /kicker-applets/kolourpicker | |
| parent | 0642ee50634d90e255c6f45194f6a47dc1157cde (diff) | |
| download | tdeaddons-4c097708c4cc24f3b8e4c21f14644f5715767d47.tar.gz tdeaddons-4c097708c4cc24f3b8e4c21f14644f5715767d47.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kicker-applets/kolourpicker')
| -rw-r--r-- | kicker-applets/kolourpicker/kolourpicker.cpp | 4 | ||||
| -rw-r--r-- | kicker-applets/kolourpicker/simplebutton.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kicker-applets/kolourpicker/kolourpicker.cpp b/kicker-applets/kolourpicker/kolourpicker.cpp index a51229e..58dc30c 100644 --- a/kicker-applets/kolourpicker/kolourpicker.cpp +++ b/kicker-applets/kolourpicker/kolourpicker.cpp @@ -50,7 +50,7 @@ extern "C" { KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { - KGlobal::locale()->insertCatalogue("kolourpicker"); + TDEGlobal::locale()->insertCatalogue("kolourpicker"); return new KolourPicker(configFile, KPanelApplet::Normal, KPanelApplet::About, parent, "kolourpicker"); @@ -100,7 +100,7 @@ KolourPicker::KolourPicker(const TQString& configFile, Type type, KolourPicker::~KolourPicker() { - KGlobal::locale()->removeCatalogue("kolourpicker"); + TDEGlobal::locale()->removeCatalogue("kolourpicker"); } diff --git a/kicker-applets/kolourpicker/simplebutton.cpp b/kicker-applets/kolourpicker/simplebutton.cpp index 2706af2..1a2631e 100644 --- a/kicker-applets/kolourpicker/simplebutton.cpp +++ b/kicker-applets/kolourpicker/simplebutton.cpp @@ -147,7 +147,7 @@ void SimpleButton::slotSettingsChanged(int category) return; } - bool changeCursor = KGlobalSettings::changeCursorOverIcon(); + bool changeCursor = TDEGlobalSettings::changeCursorOverIcon(); if (changeCursor) { |