From a4241b7911d2e0b36edfb02f616b8b282050c0ec Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 12 Jan 2024 10:51:50 +0900 Subject: Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines Signed-off-by: Michele Calgaro --- kcontrol/style/kcmstyle.cpp | 68 +++++++++++++++++----------------- kcontrol/style/keramik/keramikconf.cpp | 6 +-- kcontrol/style/styleconfdialog.cpp | 4 +- 3 files changed, 39 insertions(+), 39 deletions(-) (limited to 'kcontrol/style') diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp index 2a751f14e..27a599b09 100644 --- a/kcontrol/style/kcmstyle.cpp +++ b/kcontrol/style/kcmstyle.cpp @@ -216,9 +216,9 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) page1Layout->addWidget( gbPreview ); // Connect all required stuff - connect( cbStyle, TQT_SIGNAL(activated(int)), this, TQT_SLOT(styleChanged()) ); - connect( cbStyle, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateConfigButton())); - connect( pbConfigStyle, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleSpecificConfig())); + connect( cbStyle, TQ_SIGNAL(activated(int)), this, TQ_SLOT(styleChanged()) ); + connect( cbStyle, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateConfigButton())); + connect( pbConfigStyle, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleSpecificConfig())); // Add Page2 (Effects) // ------------------- @@ -338,13 +338,13 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) page2Layout->addItem( sp1 ); // Data flow stuff. - connect( cbEnableEffects, TQT_SIGNAL(toggled(bool)), containerFrame, TQT_SLOT(setEnabled(bool)) ); - connect( cbEnableEffects, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(menuEffectChanged(bool)) ); - connect( slOpacity, TQT_SIGNAL(valueChanged(int)),menuPreview, TQT_SLOT(setOpacity(int)) ); - connect( comboMenuEffect, TQT_SIGNAL(activated(int)), this, TQT_SLOT(menuEffectChanged()) ); - connect( comboMenuEffect, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(menuEffectChanged()) ); - connect( comboMenuEffectType, TQT_SIGNAL(activated(int)), this, TQT_SLOT(menuEffectTypeChanged()) ); - connect( comboMenuEffectType, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(menuEffectTypeChanged()) ); + connect( cbEnableEffects, TQ_SIGNAL(toggled(bool)), containerFrame, TQ_SLOT(setEnabled(bool)) ); + connect( cbEnableEffects, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(menuEffectChanged(bool)) ); + connect( slOpacity, TQ_SIGNAL(valueChanged(int)),menuPreview, TQ_SLOT(setOpacity(int)) ); + connect( comboMenuEffect, TQ_SIGNAL(activated(int)), this, TQ_SLOT(menuEffectChanged()) ); + connect( comboMenuEffect, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(menuEffectChanged()) ); + connect( comboMenuEffectType, TQ_SIGNAL(activated(int)), this, TQ_SLOT(menuEffectTypeChanged()) ); + connect( comboMenuEffectType, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(menuEffectTypeChanged()) ); // Add Page3 (Miscellaneous) // ------------------------- @@ -379,29 +379,29 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) load(); // Do all the setDirty connections. - connect(cbStyle, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setStyleDirty())); + connect(cbStyle, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setStyleDirty())); // Page2 - connect( cbEnableEffects, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setEffectsDirty())); - connect( cbEnableEffects, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setStyleDirty())); - connect( comboTooltipEffect, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setEffectsDirty())); - connect( comboRubberbandEffect, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setStyleDirty())); - connect( comboComboEffect, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setEffectsDirty())); - connect( comboMenuEffect, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setStyleDirty())); - connect( comboMenuHandle, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setStyleDirty())); - connect( comboMenuEffectType, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setStyleDirty())); - connect( slOpacity, TQT_SIGNAL(valueChanged(int)),this, TQT_SLOT(setStyleDirty())); - connect( cbMenuShadow, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setStyleDirty())); + connect( cbEnableEffects, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setEffectsDirty())); + connect( cbEnableEffects, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setStyleDirty())); + connect( comboTooltipEffect, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setEffectsDirty())); + connect( comboRubberbandEffect, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setStyleDirty())); + connect( comboComboEffect, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setEffectsDirty())); + connect( comboMenuEffect, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setStyleDirty())); + connect( comboMenuHandle, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setStyleDirty())); + connect( comboMenuEffectType, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setStyleDirty())); + connect( slOpacity, TQ_SIGNAL(valueChanged(int)),this, TQ_SLOT(setStyleDirty())); + connect( cbMenuShadow, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setStyleDirty())); // Page1 & Page3 - connect( cbHoverButtons, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setToolbarsDirty())); - connect( cbTransparentToolbars, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setToolbarsDirty())); - connect( cbEnableTooltips, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setEffectsDirty())); - connect( cbIconsOnButtons, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setEffectsDirty())); - connect( cbScrollablePopupMenus,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setEffectsDirty())); - connect( cbAutoHideAccelerators,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setEffectsDirty())); - connect( cbMenuAltKeyNavigation,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setEffectsDirty())); - connect( cbTearOffHandles, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setEffectsDirty())); - connect( comboToolbarIcons, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setToolbarsDirty())); - connect( m_popupMenuDelay, TQT_SIGNAL(valueChanged(int)),this, TQT_SLOT(setStyleDirty())); + connect( cbHoverButtons, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setToolbarsDirty())); + connect( cbTransparentToolbars, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setToolbarsDirty())); + connect( cbEnableTooltips, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setEffectsDirty())); + connect( cbIconsOnButtons, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setEffectsDirty())); + connect( cbScrollablePopupMenus,TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setEffectsDirty())); + connect( cbAutoHideAccelerators,TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setEffectsDirty())); + connect( cbMenuAltKeyNavigation,TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setEffectsDirty())); + connect( cbTearOffHandles, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setEffectsDirty())); + connect( comboToolbarIcons, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setToolbarsDirty())); + connect( m_popupMenuDelay, TQ_SIGNAL(valueChanged(int)),this, TQ_SLOT(setStyleDirty())); addWhatsThis(); @@ -479,9 +479,9 @@ void KCMStyle::styleSpecificConfig() dial->setMainWidget( pluginConfig ); //..and connect it to the wrapper - connect(pluginConfig, TQT_SIGNAL(changed(bool)), dial, TQT_SLOT(setDirty(bool))); - connect(dial, TQT_SIGNAL(defaults()), pluginConfig, TQT_SLOT(defaults())); - connect(dial, TQT_SIGNAL(save()), pluginConfig, TQT_SLOT(save())); + connect(pluginConfig, TQ_SIGNAL(changed(bool)), dial, TQ_SLOT(setDirty(bool))); + connect(dial, TQ_SIGNAL(defaults()), pluginConfig, TQ_SLOT(defaults())); + connect(dial, TQ_SIGNAL(save()), pluginConfig, TQ_SLOT(save())); if (dial->exec() == TQDialog::Accepted && dial->isDirty() ) { // Force re-rendering of the preview, to apply settings diff --git a/kcontrol/style/keramik/keramikconf.cpp b/kcontrol/style/keramik/keramikconf.cpp index 7fa6ef698..6ac4e6d4c 100644 --- a/kcontrol/style/keramik/keramikconf.cpp +++ b/kcontrol/style/keramik/keramikconf.cpp @@ -63,9 +63,9 @@ KeramikStyleConfig::KeramikStyleConfig(TQWidget* parent): TQWidget(parent) origAnimProgressBar = s.readBoolEntry("/keramik/Settings/animateProgressBar", false); animateProgressBar->setChecked(origAnimProgressBar); - //connect(highlightLineEdits, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) ); - connect(highlightScrollBar, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) ); - connect(animateProgressBar, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) ); + //connect(highlightLineEdits, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) ); + connect(highlightScrollBar, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) ); + connect(animateProgressBar, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) ); } KeramikStyleConfig::~KeramikStyleConfig() diff --git a/kcontrol/style/styleconfdialog.cpp b/kcontrol/style/styleconfdialog.cpp index 8cb426b3f..feb5deba7 100644 --- a/kcontrol/style/styleconfdialog.cpp +++ b/kcontrol/style/styleconfdialog.cpp @@ -29,8 +29,8 @@ StyleConfigDialog::StyleConfigDialog(TQWidget* parent, TQString styleName): KDialogBase::Cancel) { m_dirty = false; - connect( this, TQT_SIGNAL( defaultClicked() ), this, TQT_SIGNAL( defaults() )); - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SIGNAL( save() )); + connect( this, TQ_SIGNAL( defaultClicked() ), this, TQ_SIGNAL( defaults() )); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SIGNAL( save() )); } bool StyleConfigDialog::isDirty() const -- cgit v1.2.1