diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
| commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
| tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /kcontrol/icons/icons.cpp | |
| parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
| download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/icons/icons.cpp')
| -rw-r--r-- | kcontrol/icons/icons.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kcontrol/icons/icons.cpp b/kcontrol/icons/icons.cpp index 80eb4f1ad..8f9e46fbc 100644 --- a/kcontrol/icons/icons.cpp +++ b/kcontrol/icons/icons.cpp @@ -135,8 +135,8 @@ TQPushButton *KIconConfig::addPreviewIcon(int i, const TQString &str, TQWidget * void KIconConfig::init() { - mpLoader = KGlobal::iconLoader(); - mpConfig = KGlobal::config(); + mpLoader = TDEGlobal::iconLoader(); + mpConfig = TDEGlobal::config(); mpEffect = new KIconEffect; mpTheme = mpLoader->theme(); mUsage = 0; @@ -289,7 +289,7 @@ void KIconConfig::read() mpKickerConfig->setGroup("General"); mQuickLaunchSize = mpKickerConfig->readNumEntry("panelIconWidth", KIcon::SizeLarge); - KConfigGroup g( KGlobal::config(), "KDE" ); + KConfigGroup g( TDEGlobal::config(), "KDE" ); mpRoundedCheck->setChecked(g.readBoolEntry("IconUseRoundedRect", KDE_DEFAULT_ICONTEXTROUNDED)); mpActiveEffectCheck->setChecked(g.readBoolEntry("ShowKonqIconActivationEffect", KDE_DEFAULT_KONQ_ACTIVATION_EFFECT)); } @@ -410,7 +410,7 @@ void KIconConfig::load() void KIconConfig::load( bool useDefaults ) { - mpConfig = KGlobal::config(); + mpConfig = TDEGlobal::config(); mpConfig->setReadDefaults( useDefaults ); read(); apply(); @@ -473,7 +473,7 @@ void KIconConfig::save() mpKickerConfig->setGroup("General"); mpKickerConfig->writeEntry("panelIconWidth", mQuickLaunchSize); - KConfigGroup g( KGlobal::config(), "KDE" ); + KConfigGroup g( TDEGlobal::config(), "KDE" ); g.writeEntry("IconUseRoundedRect", mpRoundedCheck->isChecked(), true, true); g.writeEntry("ShowKonqIconActivationEffect", mpActiveEffectCheck->isChecked(), true, true); |