diff options
Diffstat (limited to 'kcontrol/taskbar/kcmtaskbar.cpp')
| -rw-r--r-- | kcontrol/taskbar/kcmtaskbar.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/kcontrol/taskbar/kcmtaskbar.cpp b/kcontrol/taskbar/kcmtaskbar.cpp index 570544a72..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 @@ -192,15 +192,15 @@ TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringL { m_isGlobalConfig = true; } - connect(m_widget->globalConfigReload, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotReloadConfigurationFromGlobals())); - connect(m_widget->globalConfigEdit, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditGlobalConfiguration())); - connect(m_widget->kcfg_UseGlobalSettings, TQT_SIGNAL(clicked()), this, TQT_SLOT(processLockouts())); - connect(m_widget->kcfg_SortByApp, TQT_SIGNAL(clicked()), this, TQT_SLOT(processLockouts())); + connect(m_widget->globalConfigReload, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotReloadConfigurationFromGlobals())); + connect(m_widget->globalConfigEdit, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEditGlobalConfiguration())); + connect(m_widget->kcfg_UseGlobalSettings, TQ_SIGNAL(clicked()), this, TQ_SLOT(processLockouts())); + connect(m_widget->kcfg_SortByApp, TQ_SIGNAL(clicked()), this, TQ_SLOT(processLockouts())); 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(); @@ -222,10 +222,10 @@ TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringL } m_widget->appearance->insertItem(i18n("Custom")); - connect(m_widget->appearance, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(appearanceChanged(int))); - connect(m_widget->kcfg_DisplayIconsNText, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(displayIconsNTextChanged(int))); + connect(m_widget->appearance, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(appearanceChanged(int))); + connect(m_widget->kcfg_DisplayIconsNText, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(displayIconsNTextChanged(int))); addConfig(m_settingsObject, m_widget); setQuickHelp(i18n("<h1>Taskbar</h1> You can configure the taskbar here." @@ -241,9 +241,9 @@ TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringL m_widget->kcfg_GroupTasks->insertStringList(i18nGroupModeList()); m_widget->kcfg_ShowTaskStates->insertStringList(i18nShowTaskStatesList()); - connect(m_widget->kcfg_GroupTasks, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotUpdateComboBox())); - connect(m_widget->kcfg_UseCustomColors, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(slotUpdateCustomColors())); + connect(m_widget->kcfg_GroupTasks, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotUpdateComboBox())); + connect(m_widget->kcfg_UseCustomColors, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(slotUpdateCustomColors())); slotUpdateCustomColors(); updateAppearanceCombo(); @@ -263,8 +263,8 @@ TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringL { m_widget->showAllScreens->show(); } - connect( m_widget->showAllScreens, TQT_SIGNAL( stateChanged( int )), TQT_SLOT( changed())); - connect( m_widget->smallIcons, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()) ); + connect( m_widget->showAllScreens, TQ_SIGNAL( stateChanged( int )), TQ_SLOT( changed())); + connect( m_widget->smallIcons, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()) ); TDEAboutData *about = new TDEAboutData(I18N_NOOP("kcmtaskbar"), I18N_NOOP("TDE Taskbar Control Module"), @@ -279,7 +279,7 @@ TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringL load(); processLockouts(); - TQTimer::singleShot(0, this, TQT_SLOT(notChanged())); + TQTimer::singleShot(0, this, TQ_SLOT(notChanged())); } TaskbarConfig::~TaskbarConfig() @@ -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() |