diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:40:51 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:40:51 -0600 |
| commit | 4c097708c4cc24f3b8e4c21f14644f5715767d47 (patch) | |
| tree | e8ca4b1d3a3b3de0d18e5f144dcef9b36f830b84 /kicker-applets/mediacontrol | |
| 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/mediacontrol')
| -rw-r--r-- | kicker-applets/mediacontrol/mediacontrol.cpp | 4 | ||||
| -rw-r--r-- | kicker-applets/mediacontrol/mediacontrolconfig.cpp | 4 | ||||
| -rw-r--r-- | kicker-applets/mediacontrol/simplebutton.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/kicker-applets/mediacontrol/mediacontrol.cpp b/kicker-applets/mediacontrol/mediacontrol.cpp index 99c79c6..c320ff9 100644 --- a/kicker-applets/mediacontrol/mediacontrol.cpp +++ b/kicker-applets/mediacontrol/mediacontrol.cpp @@ -59,7 +59,7 @@ extern "C" { KDE_EXPORT KPanelApplet *init( TQWidget *parent, const TQString &configFile) { - KGlobal::locale()->insertCatalogue("mediacontrol"); + TDEGlobal::locale()->insertCatalogue("mediacontrol"); return new MediaControl(configFile, KPanelApplet::Normal, KPanelApplet::About | KPanelApplet::Preferences | KPanelApplet::ReportBug, parent, "mediacontrol"); @@ -163,7 +163,7 @@ MediaControl::~MediaControl() delete _player; delete _configFrontend; delete _dcopClient; - KGlobal::locale()->removeCatalogue("mediacontrol"); + TDEGlobal::locale()->removeCatalogue("mediacontrol"); } // Drag-n-Drop stuff =========================================================== diff --git a/kicker-applets/mediacontrol/mediacontrolconfig.cpp b/kicker-applets/mediacontrol/mediacontrolconfig.cpp index 6df8886..14e92fa 100644 --- a/kicker-applets/mediacontrol/mediacontrolconfig.cpp +++ b/kicker-applets/mediacontrol/mediacontrolconfig.cpp @@ -63,8 +63,8 @@ MediaControlConfig::MediaControlConfig( ConfigFrontend *cfg, TQWidget *parent, c _child->themeListBox->clear(); // fill with available skins - KGlobal::dirs()->addResourceType("themes", KStandardDirs::kde_default("data") + "mediacontrol"); - TQStringList list = KGlobal::dirs()->resourceDirs("themes"); + TDEGlobal::dirs()->addResourceType("themes", KStandardDirs::kde_default("data") + "mediacontrol"); + TQStringList list = TDEGlobal::dirs()->resourceDirs("themes"); for (TQStringList::ConstIterator it = list.constBegin(); it != list.constEnd(); ++it) readSkinDir(*it); diff --git a/kicker-applets/mediacontrol/simplebutton.cpp b/kicker-applets/mediacontrol/simplebutton.cpp index 2706af2..1a2631e 100644 --- a/kicker-applets/mediacontrol/simplebutton.cpp +++ b/kicker-applets/mediacontrol/simplebutton.cpp @@ -147,7 +147,7 @@ void SimpleButton::slotSettingsChanged(int category) return; } - bool changeCursor = KGlobalSettings::changeCursorOverIcon(); + bool changeCursor = TDEGlobalSettings::changeCursorOverIcon(); if (changeCursor) { |