diff options
Diffstat (limited to 'kcontrol/taskbar/kcmtaskbar.cpp')
| -rw-r--r-- | kcontrol/taskbar/kcmtaskbar.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/kcontrol/taskbar/kcmtaskbar.cpp b/kcontrol/taskbar/kcmtaskbar.cpp index 2eb7cf376..0d6de4f0c 100644 --- a/kcontrol/taskbar/kcmtaskbar.cpp +++ b/kcontrol/taskbar/kcmtaskbar.cpp @@ -35,7 +35,7 @@ #include <kgenericfactory.h> #include <twin.h> #include <kcolorbutton.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kiconloader.h> #define protected public @@ -200,7 +200,7 @@ TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringL TQFile configFile(locateLocal("config", m_configFileName)); if (!configFile.exists()) { - TDEConfig globalConfig(GLOBAL_TASKBAR_CONFIG_FILE_NAME, TRUE, TRUE); + TDEConfig globalConfig(GLOBAL_TASKBAR_CONFIG_FILE_NAME, true, true); TDEConfig localConfig(m_configFileName); globalConfig.copyTo(m_configFileName, &localConfig); localConfig.sync(); @@ -292,7 +292,7 @@ TaskbarConfig::~TaskbarConfig() void TaskbarConfig::slotEditGlobalConfiguration() { TQByteArray data; - kapp->dcopClient()->send("kicker", "kicker", "reshowTaskBarConfig()", data); + tdeApp->dcopClient()->send("kicker", "kicker", "reshowTaskBarConfig()", data); } void TaskbarConfig::processLockouts() @@ -333,7 +333,7 @@ void TaskbarConfig::processLockouts() void TaskbarConfig::slotReloadConfigurationFromGlobals() { - TDEConfig globalConfig(GLOBAL_TASKBAR_CONFIG_FILE_NAME, TRUE, TRUE); + TDEConfig globalConfig(GLOBAL_TASKBAR_CONFIG_FILE_NAME, true, true); TDEConfig localConfig(m_configFileName); globalConfig.copyTo(m_configFileName, &localConfig); localConfig.sync(); @@ -445,7 +445,7 @@ void TaskbarConfig::load() m_widget->showAllScreens->setChecked(!m_settingsObject->showCurrentScreenOnly()); int iconSize = m_settingsObject->iconSize(); - if(kapp->iconLoader()->currentSize(TDEIcon::Small) != iconSize) + if(tdeApp->iconLoader()->currentSize(TDEIcon::Small) != iconSize) { m_widget->smallIcons->setChecked(false); } @@ -457,11 +457,11 @@ void TaskbarConfig::save() if(m_widget->smallIcons->isChecked()) { - m_settingsObject->setIconSize(kapp->iconLoader()->currentSize(TDEIcon::Small)); + m_settingsObject->setIconSize(tdeApp->iconLoader()->currentSize(TDEIcon::Small)); } else { - m_settingsObject->setIconSize(kapp->iconLoader()->currentSize(TDEIcon::Panel)); + m_settingsObject->setIconSize(tdeApp->iconLoader()->currentSize(TDEIcon::Panel)); } m_settingsObject->setShowCurrentScreenOnly(!m_widget->showAllScreens->isChecked()); @@ -474,7 +474,7 @@ void TaskbarConfig::save() m_settingsObject->writeConfig(); TQByteArray data; - kapp->dcopClient()->emitDCOPSignal("kdeTaskBarConfigChanged()", data); + tdeApp->dcopClient()->emitDCOPSignal("kdeTaskBarConfigChanged()", data); } void TaskbarConfig::defaults() |