From dc0da3d432a7ff649ce08317f586d846a859429c Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 6 Jan 2024 12:59:47 +0900 Subject: Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines Signed-off-by: Michele Calgaro --- client/config/deKoratorconfig.cpp | 122 +++++++++++++++++++------------------- client/deKoratorclient.cpp | 44 +++++++------- 2 files changed, 83 insertions(+), 83 deletions(-) diff --git a/client/config/deKoratorconfig.cpp b/client/config/deKoratorconfig.cpp index 5db97e3..fa957da 100644 --- a/client/config/deKoratorconfig.cpp +++ b/client/config/deKoratorconfig.cpp @@ -83,79 +83,79 @@ DeKoratorConfig::DeKoratorConfig( TDEConfig* config, TQWidget* parent ) // setup the connections // misc - connect( dialog_->titlealign, SIGNAL( clicked( int ) ), - this, SLOT( selectionChanged( int ) ) ); - connect( dialog_->useMenuImageChkBox, SIGNAL( clicked() ), SIGNAL( changed() ) ); - connect( dialog_->ignoreAppIcnCol, SIGNAL( clicked() ), SIGNAL( changed() ) ); - connect( dialog_->dblClkCloseChkBox, SIGNAL( clicked() ), SIGNAL( changed() ) ); - connect( dialog_->showBtmBorderChkBox, SIGNAL( clicked() ), SIGNAL( changed() ) ); - connect( dialog_->useShdtextChkBox, SIGNAL( clicked() ), SIGNAL( changed() ) ); - connect( dialog_->activeShdtextXSpinBox, SIGNAL( valueChanged( int ) ), SIGNAL( changed() ) ); - connect( dialog_->activeShdtextYSpinBox, SIGNAL( valueChanged( int ) ), SIGNAL( changed() ) ); - connect( dialog_->activeShdColBtn, SIGNAL( clicked() ), SIGNAL( changed() ) ); - connect( dialog_->inActiveShdtextXSpinBox, SIGNAL( valueChanged( int ) ), SIGNAL( changed() ) ); - connect( dialog_->inActiveShdtextYSpinBox, SIGNAL( valueChanged( int ) ), SIGNAL( changed() ) ); - connect( dialog_->inActiveShdColBtn, SIGNAL( clicked() ), SIGNAL( changed() ) ); - connect( dialog_->inActiveShdColBtn, SIGNAL( clicked( ) ), SIGNAL( changed() ) ); - connect( dialog_->btnShiftXSpinBox, SIGNAL( valueChanged( int ) ), SIGNAL( changed() ) ); - connect( dialog_->btnShiftYSpinBox, SIGNAL( valueChanged( int ) ), SIGNAL( changed() ) ); + connect( dialog_->titlealign, TQ_SIGNAL( clicked( int ) ), + this, TQ_SLOT( selectionChanged( int ) ) ); + connect( dialog_->useMenuImageChkBox, TQ_SIGNAL( clicked() ), TQ_SIGNAL( changed() ) ); + connect( dialog_->ignoreAppIcnCol, TQ_SIGNAL( clicked() ), TQ_SIGNAL( changed() ) ); + connect( dialog_->dblClkCloseChkBox, TQ_SIGNAL( clicked() ), TQ_SIGNAL( changed() ) ); + connect( dialog_->showBtmBorderChkBox, TQ_SIGNAL( clicked() ), TQ_SIGNAL( changed() ) ); + connect( dialog_->useShdtextChkBox, TQ_SIGNAL( clicked() ), TQ_SIGNAL( changed() ) ); + connect( dialog_->activeShdtextXSpinBox, TQ_SIGNAL( valueChanged( int ) ), TQ_SIGNAL( changed() ) ); + connect( dialog_->activeShdtextYSpinBox, TQ_SIGNAL( valueChanged( int ) ), TQ_SIGNAL( changed() ) ); + connect( dialog_->activeShdColBtn, TQ_SIGNAL( clicked() ), TQ_SIGNAL( changed() ) ); + connect( dialog_->inActiveShdtextXSpinBox, TQ_SIGNAL( valueChanged( int ) ), TQ_SIGNAL( changed() ) ); + connect( dialog_->inActiveShdtextYSpinBox, TQ_SIGNAL( valueChanged( int ) ), TQ_SIGNAL( changed() ) ); + connect( dialog_->inActiveShdColBtn, TQ_SIGNAL( clicked() ), TQ_SIGNAL( changed() ) ); + connect( dialog_->inActiveShdColBtn, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( changed() ) ); + connect( dialog_->btnShiftXSpinBox, TQ_SIGNAL( valueChanged( int ) ), TQ_SIGNAL( changed() ) ); + connect( dialog_->btnShiftYSpinBox, TQ_SIGNAL( valueChanged( int ) ), TQ_SIGNAL( changed() ) ); // colors - connect( dialog_->colorizeActFramesChkBox, SIGNAL( clicked() ), SIGNAL( changed() ) ); - connect( dialog_->colorizeActButtonsChkBox, SIGNAL( clicked() ), SIGNAL( changed() ) ); - connect( dialog_->colorizeInActFramesChkBox, SIGNAL( clicked() ), SIGNAL( changed() ) ); - connect( dialog_->colorizeInActButtonsChkBox, SIGNAL( clicked() ), SIGNAL( changed() ) ); - connect( dialog_->useAnimChkBox, SIGNAL( clicked() ), SIGNAL( changed() ) ); - connect( dialog_->animateEfeectsCombo, SIGNAL( activated( const TQString& ) ), SIGNAL( changed() ) ); - - connect( dialog_->stepsSpinBox, SIGNAL( valueChanged( int ) ), SIGNAL( changed() ) ); - connect( dialog_->intervalSpinBox, SIGNAL( valueChanged( int ) ), SIGNAL( changed() ) ); - connect( dialog_->KeepAnimateChkBox, SIGNAL( clicked() ), SIGNAL( changed() ) ); - - connect( dialog_->hoverTypeCombo, SIGNAL( activated( const TQString& ) ), SIGNAL( changed() ) ); - connect( dialog_->effectsAmount_SpinBox, SIGNAL( valueChanged( int ) ), SIGNAL( changed() ) ); - connect( dialog_->activeHighlightClrBtn, SIGNAL( clicked( ) ), SIGNAL( changed() ) ); - connect( dialog_->inActiveHighlightClrBtn, SIGNAL( clicked( ) ), SIGNAL( changed() ) ); - connect( dialog_->decoColorizeComboBox, SIGNAL( activated( const TQString& ) ), SIGNAL( changed() ) ); - connect( dialog_->buttonsColorizeComboBox, SIGNAL( activated( const TQString& ) ), SIGNAL( changed() ) ); - // connect( dialog_->buttonsHoverColorizeComboBox, SIGNAL( activated( const TQString& ) ), SIGNAL( changed() ) ); + connect( dialog_->colorizeActFramesChkBox, TQ_SIGNAL( clicked() ), TQ_SIGNAL( changed() ) ); + connect( dialog_->colorizeActButtonsChkBox, TQ_SIGNAL( clicked() ), TQ_SIGNAL( changed() ) ); + connect( dialog_->colorizeInActFramesChkBox, TQ_SIGNAL( clicked() ), TQ_SIGNAL( changed() ) ); + connect( dialog_->colorizeInActButtonsChkBox, TQ_SIGNAL( clicked() ), TQ_SIGNAL( changed() ) ); + connect( dialog_->useAnimChkBox, TQ_SIGNAL( clicked() ), TQ_SIGNAL( changed() ) ); + connect( dialog_->animateEfeectsCombo, TQ_SIGNAL( activated( const TQString& ) ), TQ_SIGNAL( changed() ) ); + + connect( dialog_->stepsSpinBox, TQ_SIGNAL( valueChanged( int ) ), TQ_SIGNAL( changed() ) ); + connect( dialog_->intervalSpinBox, TQ_SIGNAL( valueChanged( int ) ), TQ_SIGNAL( changed() ) ); + connect( dialog_->KeepAnimateChkBox, TQ_SIGNAL( clicked() ), TQ_SIGNAL( changed() ) ); + + connect( dialog_->hoverTypeCombo, TQ_SIGNAL( activated( const TQString& ) ), TQ_SIGNAL( changed() ) ); + connect( dialog_->effectsAmount_SpinBox, TQ_SIGNAL( valueChanged( int ) ), TQ_SIGNAL( changed() ) ); + connect( dialog_->activeHighlightClrBtn, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( changed() ) ); + connect( dialog_->inActiveHighlightClrBtn, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( changed() ) ); + connect( dialog_->decoColorizeComboBox, TQ_SIGNAL( activated( const TQString& ) ), TQ_SIGNAL( changed() ) ); + connect( dialog_->buttonsColorizeComboBox, TQ_SIGNAL( activated( const TQString& ) ), TQ_SIGNAL( changed() ) ); + // connect( dialog_->buttonsHoverColorizeComboBox, TQ_SIGNAL( activated( const TQString& ) ), TQ_SIGNAL( changed() ) ); // buttons - connect( dialog_->useCusBtnClrChkBox, SIGNAL( clicked() ), SIGNAL( changed() ) ); - connect( dialog_->cusColActBtnChkBox, SIGNAL( clicked() ), SIGNAL( changed() ) ); - connect( dialog_->cusColInActBtnChkBox, SIGNAL( clicked() ), SIGNAL( changed() ) ); - - connect( dialog_->closeClrBtn, SIGNAL( clicked( ) ), SIGNAL( changed() ) ); - connect( dialog_->minClrBtn, SIGNAL( clicked( ) ), SIGNAL( changed() ) ); - connect( dialog_->maxClrBtn, SIGNAL( clicked( ) ), SIGNAL( changed() ) ); - connect( dialog_->restoreClrBtn, SIGNAL( clicked( ) ), SIGNAL( changed() ) ); - connect( dialog_->helpClrBtn, SIGNAL( clicked( ) ), SIGNAL( changed() ) ); - connect( dialog_->menuClrBtn, SIGNAL( clicked( ) ), SIGNAL( changed() ) ); - connect( dialog_->stickyClrBtn, SIGNAL( clicked( ) ), SIGNAL( changed() ) ); - connect( dialog_->stickyDownClrBtn, SIGNAL( clicked( ) ), SIGNAL( changed() ) ); - connect( dialog_->aboveClrBtn, SIGNAL( clicked( ) ), SIGNAL( changed() ) ); - connect( dialog_->aboveDownClrBtn, SIGNAL( clicked( ) ), SIGNAL( changed() ) ); - connect( dialog_->belowClrBtn, SIGNAL( clicked( ) ), SIGNAL( changed() ) ); - connect( dialog_->belowDownClrBtn, SIGNAL( clicked( ) ), SIGNAL( changed() ) ); - connect( dialog_->shadeClrBtn, SIGNAL( clicked( ) ), SIGNAL( changed() ) ); - connect( dialog_->shadeDownClrBtn, SIGNAL( clicked( ) ), SIGNAL( changed() ) ); + connect( dialog_->useCusBtnClrChkBox, TQ_SIGNAL( clicked() ), TQ_SIGNAL( changed() ) ); + connect( dialog_->cusColActBtnChkBox, TQ_SIGNAL( clicked() ), TQ_SIGNAL( changed() ) ); + connect( dialog_->cusColInActBtnChkBox, TQ_SIGNAL( clicked() ), TQ_SIGNAL( changed() ) ); + + connect( dialog_->closeClrBtn, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( changed() ) ); + connect( dialog_->minClrBtn, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( changed() ) ); + connect( dialog_->maxClrBtn, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( changed() ) ); + connect( dialog_->restoreClrBtn, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( changed() ) ); + connect( dialog_->helpClrBtn, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( changed() ) ); + connect( dialog_->menuClrBtn, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( changed() ) ); + connect( dialog_->stickyClrBtn, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( changed() ) ); + connect( dialog_->stickyDownClrBtn, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( changed() ) ); + connect( dialog_->aboveClrBtn, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( changed() ) ); + connect( dialog_->aboveDownClrBtn, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( changed() ) ); + connect( dialog_->belowClrBtn, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( changed() ) ); + connect( dialog_->belowDownClrBtn, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( changed() ) ); + connect( dialog_->shadeClrBtn, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( changed() ) ); + connect( dialog_->shadeDownClrBtn, TQ_SIGNAL( clicked( ) ), TQ_SIGNAL( changed() ) ); // path's - connect( dialog_->framesPathKurl, SIGNAL( textChanged( const TQString& ) ), SIGNAL( changed() ) ); + connect( dialog_->framesPathKurl, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SIGNAL( changed() ) ); dialog_->framesPathKurl->setMode( 2 ); - connect( dialog_->buttonsPathKurl, SIGNAL( textChanged( const TQString& ) ), SIGNAL( changed() ) ); + connect( dialog_->buttonsPathKurl, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SIGNAL( changed() ) ); dialog_->buttonsPathKurl->setMode( 2 ); - connect( dialog_->useMasks_Chkbox, SIGNAL( clicked() ), SIGNAL( changed() ) ); - connect( dialog_->masksPathKurl, SIGNAL( textChanged( const TQString& ) ), SIGNAL( changed() ) ); + connect( dialog_->useMasks_Chkbox, TQ_SIGNAL( clicked() ), TQ_SIGNAL( changed() ) ); + connect( dialog_->masksPathKurl, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SIGNAL( changed() ) ); dialog_->masksPathKurl->setMode( 2 ); // themes - connect( dialog_->themesKlstView, SIGNAL( selectionChanged( TQListViewItem * ) ), - SLOT( themeSelected( TQListViewItem * ) ) ); - connect( dialog_->installthemeBtn, SIGNAL( clicked( ) ), SLOT( installNewTheme() ) ); - connect( dialog_->removeThemBtn, SIGNAL( clicked( ) ), SLOT( removeSelectedTheme() ) ); - connect( dialog_->applyThemeBtn, SIGNAL( clicked( ) ), SLOT( setTheme() ) ); + connect( dialog_->themesKlstView, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), + TQ_SLOT( themeSelected( TQListViewItem * ) ) ); + connect( dialog_->installthemeBtn, TQ_SIGNAL( clicked( ) ), TQ_SLOT( installNewTheme() ) ); + connect( dialog_->removeThemBtn, TQ_SIGNAL( clicked( ) ), TQ_SLOT( removeSelectedTheme() ) ); + connect( dialog_->applyThemeBtn, TQ_SIGNAL( clicked( ) ), TQ_SLOT( setTheme() ) ); } diff --git a/client/deKoratorclient.cpp b/client/deKoratorclient.cpp index ac294ca..a88b365 100644 --- a/client/deKoratorclient.cpp +++ b/client/deKoratorclient.cpp @@ -1209,7 +1209,7 @@ DeKoratorButton::DeKoratorButton( bool isLeft, int buttonWidth, int buttonHeight TQToolTip::add ( this, tip ); animTmr = new TQTimer( this ); - connect( animTmr, SIGNAL( timeout() ), this, SLOT( animate() ) ); + connect( animTmr, TQ_SIGNAL( timeout() ), this, TQ_SLOT( animate() ) ); } ////////////////////////////////////////////////////////////////////////////// @@ -1714,8 +1714,8 @@ void DeKoratorClient::init() mainLayout_->addItem( bottomSpacer_ ); // connections - connect( this, SIGNAL( keepAboveChanged( bool ) ), SLOT( keepAboveChange( bool ) ) ); - connect( this, SIGNAL( keepBelowChanged( bool ) ), SLOT( keepBelowChange( bool ) ) ); + connect( this, TQ_SIGNAL( keepAboveChanged( bool ) ), TQ_SLOT( keepAboveChange( bool ) ) ); + connect( this, TQ_SIGNAL( keepBelowChanged( bool ) ), TQ_SLOT( keepBelowChange( bool ) ) ); captionBufferDirty_ = true; //maskDirty_ = true; @@ -1745,9 +1745,9 @@ void DeKoratorClient::addButtons( TQBoxLayout * layout, const TQString & s, bool { button[ ButtonMenu ] = new DeKoratorButton( isLeft, ( BTNMENUWIDTH < 16 ) ? 16 : BTNMENUWIDTH, BTNMENUHEIGHT, this, "menu", i18n( "Menu" ), ButtonMenu, menu ); - connect( button[ ButtonMenu ], SIGNAL( pressed() ), - this, SLOT( menuButtonPressed() ) ); - connect( button[ ButtonMenu ], SIGNAL( released() ), this, SLOT( menuButtonReleased() ) ); + connect( button[ ButtonMenu ], TQ_SIGNAL( pressed() ), + this, TQ_SLOT( menuButtonPressed() ) ); + connect( button[ ButtonMenu ], TQ_SIGNAL( released() ), this, TQ_SLOT( menuButtonReleased() ) ); layout->addWidget( button[ ButtonMenu ] ); } @@ -1774,8 +1774,8 @@ void DeKoratorClient::addButtons( TQBoxLayout * layout, const TQString & s, bool } button[ ButtonSticky ] = new DeKoratorButton( isLeft, BTNSTICKYWIDTH, BTNSTICKYHEIGHT, this, "sticky", d ? i18n( "Sticky" ) : i18n( "Un-Sticky" ), ButtonSticky, btnType ); - connect( button[ ButtonSticky ], SIGNAL( clicked() ), - this, SLOT( toggleOnAllDesktops() ) ); + connect( button[ ButtonSticky ], TQ_SIGNAL( clicked() ), + this, TQ_SLOT( toggleOnAllDesktops() ) ); layout->addWidget( button[ ButtonSticky ] ); } break; @@ -1787,8 +1787,8 @@ void DeKoratorClient::addButtons( TQBoxLayout * layout, const TQString & s, bool button[ ButtonHelp ] = new DeKoratorButton( isLeft, BTNHELPEWIDTH, BTNHELPEHEIGHT, this, "help", i18n( "Help" ), ButtonHelp, help ); - connect( button[ ButtonHelp ], SIGNAL( clicked() ), - this, SLOT( showContextHelp() ) ); + connect( button[ ButtonHelp ], TQ_SIGNAL( clicked() ), + this, TQ_SLOT( showContextHelp() ) ); layout->addWidget( button[ ButtonHelp ] ); } break; @@ -1799,8 +1799,8 @@ void DeKoratorClient::addButtons( TQBoxLayout * layout, const TQString & s, bool { button[ ButtonMin ] = new DeKoratorButton( isLeft, BTNMINWIDTH, BTNMINHEIGHT, this, "iconify", i18n( "Minimize" ), ButtonMin, min ); - connect( button[ ButtonMin ], SIGNAL( clicked() ), - this, SLOT( minimize() ) ); + connect( button[ ButtonMin ], TQ_SIGNAL( clicked() ), + this, TQ_SLOT( minimize() ) ); layout->addWidget( button[ ButtonMin ] ); } break; @@ -1833,8 +1833,8 @@ void DeKoratorClient::addButtons( TQBoxLayout * layout, const TQString & s, bool button[ ButtonMax ] = new DeKoratorButton( isLeft, BTNMAXWIDTH, BTNMAXHEIGHT, this, "maximize", m ? i18n( "Restore" ) : i18n( "Maximize" ), ButtonMax, btnType ); - connect( button[ ButtonMax ], SIGNAL( clicked() ), - this, SLOT( maxButtonPressed() ) ); + connect( button[ ButtonMax ], TQ_SIGNAL( clicked() ), + this, TQ_SLOT( maxButtonPressed() ) ); layout->addWidget( button[ ButtonMax ] ); } break; @@ -1846,8 +1846,8 @@ void DeKoratorClient::addButtons( TQBoxLayout * layout, const TQString & s, bool button[ ButtonClose ] = new DeKoratorButton( isLeft, BTNCLOSEWIDTH, BTNCLOSEHEIGHT, this, "close", i18n( "Close" ), ButtonClose, close ); - connect( button[ ButtonClose ], SIGNAL( clicked() ), - this, SLOT( closeWindow() ) ); + connect( button[ ButtonClose ], TQ_SIGNAL( clicked() ), + this, TQ_SLOT( closeWindow() ) ); layout->addWidget( button[ ButtonClose ] ); } break; @@ -1869,8 +1869,8 @@ void DeKoratorClient::addButtons( TQBoxLayout * layout, const TQString & s, bool button[ ButtonAbove ] = new DeKoratorButton( isLeft, BTNABOVEWIDTH, BTNABOVEHEIGHT, this, "above", i18n( "Keep Above Others" ), ButtonAbove, btnType ); - connect( button[ ButtonAbove ], SIGNAL( clicked() ), - this, SLOT( aboveButtonPressed() ) ); + connect( button[ ButtonAbove ], TQ_SIGNAL( clicked() ), + this, TQ_SLOT( aboveButtonPressed() ) ); layout->addWidget( button[ ButtonAbove ] ); } break; @@ -1892,8 +1892,8 @@ void DeKoratorClient::addButtons( TQBoxLayout * layout, const TQString & s, bool button[ ButtonBelow ] = new DeKoratorButton( isLeft, BTNBELOWWIDTH, BTNBELOWHEIGHT, this, "below", i18n( "Keep Below Others" ), ButtonBelow, btnType ); - connect( button[ ButtonBelow ], SIGNAL( clicked() ), - this, SLOT( belowButtonPressed() ) ); + connect( button[ ButtonBelow ], TQ_SIGNAL( clicked() ), + this, TQ_SLOT( belowButtonPressed() ) ); layout->addWidget( button[ ButtonBelow ] ); } break; @@ -1914,8 +1914,8 @@ void DeKoratorClient::addButtons( TQBoxLayout * layout, const TQString & s, bool button[ ButtonShade ] = new DeKoratorButton( isLeft, BTNSHADEWIDTH, BTNSHADEHEIGHT, this, "shade", s ? i18n( "Unshade" ) : i18n( "Shade" ), ButtonShade, btnType ); - connect( button[ ButtonShade ], SIGNAL( clicked() ), - this, SLOT( shadeButtonPressed() ) ); + connect( button[ ButtonShade ], TQ_SIGNAL( clicked() ), + this, TQ_SLOT( shadeButtonPressed() ) ); layout->addWidget( button[ ButtonShade ] ); } break; -- cgit v1.2.1