diff options
| author | Michele Calgaro <[email protected]> | 2024-01-12 10:51:50 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2024-01-16 10:03:43 +0900 |
| commit | a4241b7911d2e0b36edfb02f616b8b282050c0ec (patch) | |
| tree | 316c9a3298857645d5da57b682fce707c8e2a907 /twin | |
| parent | f9d06cee3d2b4ffe415b1d52c9ad5575643a9e34 (diff) | |
| download | tdebase-a4241b7911d2e0b36edfb02f616b8b282050c0ec.tar.gz tdebase-a4241b7911d2e0b36edfb02f616b8b282050c0ec.zip | |
Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines
Signed-off-by: Michele Calgaro <[email protected]>
Diffstat (limited to 'twin')
32 files changed, 374 insertions, 374 deletions
diff --git a/twin/activation.cpp b/twin/activation.cpp index 0deb81798..47e0f9a34 100644 --- a/twin/activation.cpp +++ b/twin/activation.cpp @@ -727,7 +727,7 @@ void Client::demandAttention( bool set ) if( demandAttentionKNotifyTimer == NULL ) { demandAttentionKNotifyTimer = new TQTimer( this ); - connect( demandAttentionKNotifyTimer, TQT_SIGNAL( timeout()), TQT_SLOT( demandAttentionKNotify())); + connect( demandAttentionKNotifyTimer, TQ_SIGNAL( timeout()), TQ_SLOT( demandAttentionKNotify())); } demandAttentionKNotifyTimer->start( 1000, true ); } diff --git a/twin/client.cpp b/twin/client.cpp index 75aa896d4..b8f00746e 100644 --- a/twin/client.cpp +++ b/twin/client.cpp @@ -130,14 +130,14 @@ Client::Client( Workspace *ws ) shadeHoverTimer = 0; configureRequestTimer = new TQTimer(this); - connect(configureRequestTimer, TQT_SIGNAL(timeout()), TQT_SLOT(configureRequestTimeout())); + connect(configureRequestTimer, TQ_SIGNAL(timeout()), TQ_SLOT(configureRequestTimeout())); shadowDelayTimer = new TQTimer(this); opacityCache = &activeOpacityCache; shadowAfterClient = NULL; shadowWidget = NULL; shadowMe = true; - connect(shadowDelayTimer, TQT_SIGNAL(timeout()), TQT_SLOT(drawShadow())); + connect(shadowDelayTimer, TQ_SIGNAL(timeout()), TQ_SLOT(drawShadow())); // set the initial mapping state mapping_state = WithdrawnState; @@ -1210,7 +1210,7 @@ void Client::drawDelayedShadow() void Client::drawShadowAfter(Client *after) { shadowAfterClient = after; - connect(after, TQT_SIGNAL(shadowDrawn()), TQT_SLOT(drawShadow())); + connect(after, TQ_SIGNAL(shadowDrawn()), TQ_SLOT(drawShadow())); } /*! @@ -1224,7 +1224,7 @@ void Client::drawShadow() // If we are waiting for another Client's shadow to be drawn, stop waiting now if (shadowAfterClient != NULL) { - disconnect(shadowAfterClient, TQT_SIGNAL(shadowDrawn()), this, TQT_SLOT(drawShadow())); + disconnect(shadowAfterClient, TQ_SIGNAL(shadowDrawn()), this, TQ_SLOT(drawShadow())); shadowAfterClient = NULL; } @@ -1791,7 +1791,7 @@ void Client::pingWindow() if( ping_timer != NULL ) return; // pinging already ping_timer = new TQTimer( this ); - connect( ping_timer, TQT_SIGNAL( timeout()), TQT_SLOT( pingTimeout())); + connect( ping_timer, TQ_SIGNAL( timeout()), TQ_SLOT( pingTimeout())); ping_timer->start( options->killPingTimeout, true ); ping_timestamp = get_tqt_x_time(); workspace()->sendPingToWindow( window(), ping_timestamp ); @@ -1850,8 +1850,8 @@ void Client::killProcess( bool ask, Time timestamp ) << "--applicationname" << resourceClass() << "--wid" << TQCString().setNum( window()) << "--timestamp" << TQCString().setNum( timestamp ); - connect( process_killer, TQT_SIGNAL( processExited( TDEProcess* )), - TQT_SLOT( processKillerExited())); + connect( process_killer, TQ_SIGNAL( processExited( TDEProcess* )), + TQ_SLOT( processKillerExited())); if( !process_killer->start( TDEProcess::NotifyOnExit )) { delete process_killer; @@ -2002,8 +2002,8 @@ bool Client::queryUserSuspendedResume() << "--windowname" << caption().utf8() << "--applicationname" << resourceClass() << "--wid" << TQCString().setNum( window()); - connect( process_resumer, TQT_SIGNAL( processExited( TDEProcess* )), - TQT_SLOT( processResumerExited())); + connect( process_resumer, TQ_SIGNAL( processExited( TDEProcess* )), + TQ_SLOT( processResumerExited())); if( !process_resumer->start( TDEProcess::NotifyOnExit )) { delete process_resumer; diff --git a/twin/clients/b2/b2client.cpp b/twin/clients/b2/b2client.cpp index 6339402b7..16a451932 100644 --- a/twin/clients/b2/b2client.cpp +++ b/twin/clients/b2/b2client.cpp @@ -464,8 +464,8 @@ void B2Client::addButtons(const TQString& s, const TQString tips[], TQt::LeftButton | TQt::RightButton); button[BtnMenu]->setPixmaps(P_MENU); button[BtnMenu]->setUseMiniIcon(); - connect(button[BtnMenu], TQT_SIGNAL(pressed()), - this, TQT_SLOT(menuButtonPressed())); + connect(button[BtnMenu], TQ_SIGNAL(pressed()), + this, TQ_SLOT(menuButtonPressed())); titleLayout->addWidget(button[BtnMenu]); } } @@ -477,8 +477,8 @@ void B2Client::addButtons(const TQString& s, const TQString tips[], button[BtnSticky]->setPixmaps(P_PINUP); button[BtnSticky]->setToggle(); button[BtnSticky]->setDown(isOnAllDesktops()); - connect(button[BtnSticky], TQT_SIGNAL(clicked()), - this, TQT_SLOT(toggleOnAllDesktops())); + connect(button[BtnSticky], TQ_SIGNAL(clicked()), + this, TQ_SLOT(toggleOnAllDesktops())); titleLayout->addWidget(button[BtnSticky]); } } @@ -487,8 +487,8 @@ void B2Client::addButtons(const TQString& s, const TQString tips[], if (providesContextHelp() && (!button[BtnHelp])) { button[BtnHelp] = new B2Button(this, tb, tips[BtnHelp]); button[BtnHelp]->setPixmaps(P_HELP); - connect(button[BtnHelp], TQT_SIGNAL(clicked()), - this, TQT_SLOT(showContextHelp())); + connect(button[BtnHelp], TQ_SIGNAL(clicked()), + this, TQ_SLOT(showContextHelp())); titleLayout->addWidget(button[BtnHelp]); } break; @@ -496,8 +496,8 @@ void B2Client::addButtons(const TQString& s, const TQString tips[], if (isMinimizable() && (!button[BtnIconify])) { button[BtnIconify] = new B2Button(this, tb,tips[BtnIconify]); button[BtnIconify]->setPixmaps(P_ICONIFY); - connect(button[BtnIconify], TQT_SIGNAL(clicked()), - this, TQT_SLOT(minimize())); + connect(button[BtnIconify], TQ_SIGNAL(clicked()), + this, TQ_SLOT(minimize())); titleLayout->addWidget(button[BtnIconify]); } break; @@ -507,8 +507,8 @@ void B2Client::addButtons(const TQString& s, const TQString tips[], TQt::LeftButton | TQt::MidButton | TQt::RightButton); button[BtnMax]->setPixmaps(maximizeMode() == MaximizeFull ? P_NORMALIZE : P_MAX); - connect(button[BtnMax], TQT_SIGNAL(clicked()), - this, TQT_SLOT(maxButtonClicked())); + connect(button[BtnMax], TQ_SIGNAL(clicked()), + this, TQ_SLOT(maxButtonClicked())); titleLayout->addWidget(button[BtnMax]); } break; @@ -516,8 +516,8 @@ void B2Client::addButtons(const TQString& s, const TQString tips[], if (isCloseable() && !button[BtnClose]) { button[BtnClose] = new B2Button(this, tb, tips[BtnClose]); button[BtnClose]->setPixmaps(P_CLOSE); - connect(button[BtnClose], TQT_SIGNAL(clicked()), - this, TQT_SLOT(closeWindow())); + connect(button[BtnClose], TQ_SIGNAL(clicked()), + this, TQ_SLOT(closeWindow())); titleLayout->addWidget(button[BtnClose]); } break; @@ -525,8 +525,8 @@ void B2Client::addButtons(const TQString& s, const TQString tips[], if (isShadeable() && !button[BtnShade]) { button[BtnShade] = new B2Button(this, tb, tips[BtnShade]); button[BtnShade]->setPixmaps(P_SHADE); - connect(button[BtnShade], TQT_SIGNAL(clicked()), - this, TQT_SLOT(shadeButtonClicked())); + connect(button[BtnShade], TQ_SIGNAL(clicked()), + this, TQ_SLOT(shadeButtonClicked())); titleLayout->addWidget(button[BtnShade]); } break; @@ -534,8 +534,8 @@ void B2Client::addButtons(const TQString& s, const TQString tips[], if (resizable && !button[BtnResize]) { button[BtnResize] = new B2Button(this, tb, tips[BtnResize]); button[BtnResize]->setPixmaps(P_RESIZE); - connect(button[BtnResize], TQT_SIGNAL(pressed()), - this, TQT_SLOT(resizeButtonPressed())); + connect(button[BtnResize], TQ_SIGNAL(pressed()), + this, TQ_SLOT(resizeButtonPressed())); titleLayout->addWidget(button[BtnResize]); } break; diff --git a/twin/clients/b2/config/config.cpp b/twin/clients/b2/config/config.cpp index 5b7a29e0f..b955254ec 100644 --- a/twin/clients/b2/config/config.cpp +++ b/twin/clients/b2/config/config.cpp @@ -70,12 +70,12 @@ B2Config::B2Config( TDEConfig* conf, TQWidget* parent ) load(conf); // Ensure we track user changes properly - connect(cbColorBorder, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSelectionChanged())); - connect(showGrabHandleCb, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSelectionChanged())); - connect(menuDblClickOp, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotSelectionChanged())); + connect(cbColorBorder, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSelectionChanged())); + connect(showGrabHandleCb, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSelectionChanged())); + connect(menuDblClickOp, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotSelectionChanged())); // Make the widgets visible in twindecoration gb->show(); } diff --git a/twin/clients/default/config/config.cpp b/twin/clients/default/config/config.cpp index 886077925..36ddb1402 100644 --- a/twin/clients/default/config/config.cpp +++ b/twin/clients/default/config/config.cpp @@ -61,13 +61,13 @@ KDEDefaultConfig::KDEDefaultConfig( TDEConfig* conf, TQWidget* parent ) load( conf ); // Ensure we track user changes properly - connect( cbShowStipple, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSelectionChanged()) ); - connect( cbShowGrabBar, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSelectionChanged()) ); + connect( cbShowStipple, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSelectionChanged()) ); + connect( cbShowGrabBar, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSelectionChanged()) ); if (highcolor) - connect( cbUseGradients, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSelectionChanged()) ); + connect( cbUseGradients, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSelectionChanged()) ); // Make the widgets visible in twindecoration gb->show(); diff --git a/twin/clients/keramik/config/config.cpp b/twin/clients/keramik/config/config.cpp index dfd5e20aa..98a46e308 100644 --- a/twin/clients/keramik/config/config.cpp +++ b/twin/clients/keramik/config/config.cpp @@ -55,10 +55,10 @@ KeramikConfig::KeramikConfig( TDEConfig* conf, TQWidget* parent ) c = new TDEConfig( "twinkeramikrc" ); ui = new KeramikConfigUI( parent ); - connect( ui->showAppIcons, TQT_SIGNAL(clicked()), TQT_SIGNAL(changed()) ); - connect( ui->smallCaptions, TQT_SIGNAL(clicked()), TQT_SIGNAL(changed()) ); - connect( ui->largeGrabBars, TQT_SIGNAL(clicked()), TQT_SIGNAL(changed()) ); - connect( ui->useShadowedText, TQT_SIGNAL(clicked()), TQT_SIGNAL(changed()) ); + connect( ui->showAppIcons, TQ_SIGNAL(clicked()), TQ_SIGNAL(changed()) ); + connect( ui->smallCaptions, TQ_SIGNAL(clicked()), TQ_SIGNAL(changed()) ); + connect( ui->largeGrabBars, TQ_SIGNAL(clicked()), TQ_SIGNAL(changed()) ); + connect( ui->useShadowedText, TQ_SIGNAL(clicked()), TQ_SIGNAL(changed()) ); load( conf ); ui->show(); diff --git a/twin/clients/keramik/keramik.cpp b/twin/clients/keramik/keramik.cpp index fe7cc37d7..942962693 100644 --- a/twin/clients/keramik/keramik.cpp +++ b/twin/clients/keramik/keramik.cpp @@ -907,8 +907,8 @@ KeramikClient::KeramikClient( KDecorationBridge* bridge, KDecorationFactory* fac void KeramikClient::init() { - connect( this, TQT_SIGNAL( keepAboveChanged( bool )), TQT_SLOT( keepAboveChange( bool ))); - connect( this, TQT_SIGNAL( keepBelowChanged( bool )), TQT_SLOT( keepBelowChange( bool ))); + connect( this, TQ_SIGNAL( keepAboveChanged( bool )), TQ_SLOT( keepAboveChange( bool ))); + connect( this, TQ_SIGNAL( keepBelowChanged( bool )), TQ_SLOT( keepBelowChange( bool ))); createMainWidget( (WFlags)(WStaticContents | WResizeNoErase | WRepaintNoErase) ); widget()->installEventFilter( this ); @@ -1051,7 +1051,7 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s ) if (!isModalSystemNotification()) { if ( !button[MenuButton] ) { button[MenuButton] = new KeramikButton( this, "menu", MenuButton, i18n("Menu"), TQt::LeftButton|TQt::RightButton ); - connect( button[MenuButton], TQT_SIGNAL( pressed() ), TQT_SLOT( menuButtonPressed() ) ); + connect( button[MenuButton], TQ_SIGNAL( pressed() ), TQ_SLOT( menuButtonPressed() ) ); layout->addWidget( button[MenuButton] ); } } @@ -1065,7 +1065,7 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s ) OnAllDesktopsButton, isOnAllDesktops()?i18n("Not on all desktops"):i18n("On all desktops") ); if(isOnAllDesktops()) button[OnAllDesktopsButton]->toggle(); - connect( button[OnAllDesktopsButton], TQT_SIGNAL( clicked() ), TQT_SLOT( toggleOnAllDesktops() ) ); + connect( button[OnAllDesktopsButton], TQ_SIGNAL( clicked() ), TQ_SLOT( toggleOnAllDesktops() ) ); layout->addWidget( button[OnAllDesktopsButton] ); } } @@ -1075,7 +1075,7 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s ) case 'H' : if ( !button[HelpButton] && providesContextHelp() ) { button[HelpButton] = new KeramikButton( this, "help", HelpButton, i18n("Help") ); - connect( button[HelpButton], TQT_SIGNAL( clicked() ), TQT_SLOT( showContextHelp() ) ); + connect( button[HelpButton], TQ_SIGNAL( clicked() ), TQ_SLOT( showContextHelp() ) ); layout->addWidget( button[HelpButton] ); } break; @@ -1084,7 +1084,7 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s ) case 'I' : if ( !button[MinButton] && isMinimizable() ) { button[MinButton] = new KeramikButton( this, "minimize", MinButton, i18n("Minimize") ); - connect( button[MinButton], TQT_SIGNAL( clicked() ), TQT_SLOT( minimize() ) ); + connect( button[MinButton], TQ_SIGNAL( clicked() ), TQ_SLOT( minimize() ) ); layout->addWidget( button[MinButton] ); } break; @@ -1093,7 +1093,7 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s ) case 'A' : if ( !button[MaxButton] && isMaximizable() ) { button[MaxButton] = new KeramikButton( this, "maximize", MaxButton, i18n("Maximize"), TQt::LeftButton|TQt::MidButton|TQt::RightButton ); - connect( button[MaxButton], TQT_SIGNAL( clicked() ), TQT_SLOT( slotMaximize() ) ); + connect( button[MaxButton], TQ_SIGNAL( clicked() ), TQ_SLOT( slotMaximize() ) ); layout->addWidget( button[MaxButton] ); } break; @@ -1102,7 +1102,7 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s ) case 'X' : if ( !button[CloseButton] && isCloseable() ) { button[CloseButton] = new KeramikButton( this, "close", CloseButton, i18n("Close") ); - connect( button[CloseButton], TQT_SIGNAL( clicked() ), TQT_SLOT( closeWindow() ) ); + connect( button[CloseButton], TQ_SIGNAL( clicked() ), TQ_SLOT( closeWindow() ) ); layout->addWidget( button[CloseButton] ); } break; @@ -1111,7 +1111,7 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s ) case 'F' : if ( !button[AboveButton]) { button[AboveButton] = new KeramikButton( this, "above", AboveButton, i18n("Keep Above Others") ); - connect( button[AboveButton], TQT_SIGNAL( clicked() ), TQT_SLOT( slotAbove() ) ); + connect( button[AboveButton], TQ_SIGNAL( clicked() ), TQ_SLOT( slotAbove() ) ); layout->addWidget( button[AboveButton] ); } break; @@ -1120,7 +1120,7 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s ) case 'B' : if ( !button[BelowButton]) { button[BelowButton] = new KeramikButton( this, "below", BelowButton, i18n("Keep Below Others") ); - connect( button[BelowButton], TQT_SIGNAL( clicked() ), TQT_SLOT( slotBelow() ) ); + connect( button[BelowButton], TQ_SIGNAL( clicked() ), TQ_SLOT( slotBelow() ) ); layout->addWidget( button[BelowButton] ); } break; @@ -1130,7 +1130,7 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s ) if ( !button[ShadeButton] && isShadeable() ) { button[ShadeButton] = new KeramikButton( this, "shade", ShadeButton, isSetShade() ? i18n("Unshade") : i18n( "Shade" )); - connect( button[ShadeButton], TQT_SIGNAL( clicked() ), TQT_SLOT( slotShade() ) ); + connect( button[ShadeButton], TQ_SIGNAL( clicked() ), TQ_SLOT( slotShade() ) ); layout->addWidget( button[ShadeButton] ); } break; diff --git a/twin/clients/kwmtheme/kwmthemeclient.cpp b/twin/clients/kwmtheme/kwmthemeclient.cpp index 4daffae7c..defc8a3df 100644 --- a/twin/clients/kwmtheme/kwmthemeclient.cpp +++ b/twin/clients/kwmtheme/kwmthemeclient.cpp @@ -293,8 +293,8 @@ void KWMThemeClient::init() iconChange(); hb->addWidget(mnuBtn); mnuBtn->setFixedSize(20, 20); - connect(mnuBtn, TQT_SIGNAL(pressed()), this, - TQT_SLOT(menuButtonPressed())); + connect(mnuBtn, TQ_SIGNAL(pressed()), this, + TQ_SLOT(menuButtonPressed())); } else if(val == "Sticky"){ stickyBtn = new MyButton(widget(), "sticky"); @@ -303,7 +303,7 @@ void KWMThemeClient::init() stickyBtn->setPixmap(*pindownPix); else stickyBtn->setPixmap(*pinupPix); - connect(stickyBtn, TQT_SIGNAL( clicked() ), this, TQT_SLOT(toggleOnAllDesktops())); + connect(stickyBtn, TQ_SIGNAL( clicked() ), this, TQ_SLOT(toggleOnAllDesktops())); hb->addWidget(stickyBtn); stickyBtn->setFixedSize(20, 20); } @@ -311,7 +311,7 @@ void KWMThemeClient::init() btn = new MyButton(widget(), "iconify"); TQToolTip::add( btn, i18n("Minimize")); btn->setPixmap(*iconifyPix); - connect(btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(minimize())); + connect(btn, TQ_SIGNAL(clicked()), this, TQ_SLOT(minimize())); hb->addWidget(btn); btn->setFixedSize(20, 20); } @@ -319,7 +319,7 @@ void KWMThemeClient::init() maxBtn = new MyButton(widget(), "max"); TQToolTip::add( maxBtn, i18n("Maximize")); maxBtn->setPixmap(*maxPix); - connect(maxBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(maximize())); + connect(maxBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(maximize())); hb->addWidget(maxBtn); maxBtn->setFixedSize(20, 20); } @@ -327,7 +327,7 @@ void KWMThemeClient::init() btn = new MyButton(widget(), "close"); TQToolTip::add( btn, i18n("Close")); btn->setPixmap(*closePix); - connect(btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(closeWindow())); + connect(btn, TQ_SIGNAL(clicked()), this, TQ_SLOT(closeWindow())); hb->addWidget(btn); btn->setFixedSize(20, 20); } diff --git a/twin/clients/modernsystem/config/config.cpp b/twin/clients/modernsystem/config/config.cpp index 4512203c4..187278d43 100644 --- a/twin/clients/modernsystem/config/config.cpp +++ b/twin/clients/modernsystem/config/config.cpp @@ -44,7 +44,7 @@ ModernSysConfig::ModernSysConfig(TDEConfig* conf, TQWidget* parent) : TQObject(p "easier, especially for trackballs and other mouse replacements " "on laptops.")); layout->addMultiCellWidget(cbShowHandle, 0, 0, 0, 1); - connect(cbShowHandle, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectionChanged())); + connect(cbShowHandle, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSelectionChanged())); sliderBox = new TQVBox(handleBox); handleSizeSlider = new TQSlider(0, 4, 1, 0, TQt::Horizontal, sliderBox); @@ -52,7 +52,7 @@ ModernSysConfig::ModernSysConfig(TDEConfig* conf, TQWidget* parent) : TQObject(p i18n("Here you can change the size of the resize handle.")); handleSizeSlider->setTickInterval(1); handleSizeSlider->setTickmarks(TQSlider::Below); - connect(handleSizeSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSelectionChanged())); + connect(handleSizeSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotSelectionChanged())); hbox = new TQHBox(sliderBox); hbox->setSpacing(6); diff --git a/twin/clients/plastik/config/config.cpp b/twin/clients/plastik/config/config.cpp index 04658796c..81192f699 100644 --- a/twin/clients/plastik/config/config.cpp +++ b/twin/clients/plastik/config/config.cpp @@ -49,16 +49,16 @@ PlastikConfig::PlastikConfig(TDEConfig* config, TQWidget* parent) load(config); // setup the connections - connect(m_dialog->titleAlign, TQT_SIGNAL(clicked(int)), - this, TQT_SIGNAL(changed())); - connect(m_dialog->animateButtons, TQT_SIGNAL(toggled(bool)), - this, TQT_SIGNAL(changed())); - connect(m_dialog->menuClose, TQT_SIGNAL(toggled(bool)), - this, TQT_SIGNAL(changed())); - connect(m_dialog->titleShadow, TQT_SIGNAL(toggled(bool)), - this, TQT_SIGNAL(changed())); - connect(m_dialog->coloredBorder, TQT_SIGNAL(toggled(bool)), - this, TQT_SIGNAL(changed())); + connect(m_dialog->titleAlign, TQ_SIGNAL(clicked(int)), + this, TQ_SIGNAL(changed())); + connect(m_dialog->animateButtons, TQ_SIGNAL(toggled(bool)), + this, TQ_SIGNAL(changed())); + connect(m_dialog->menuClose, TQ_SIGNAL(toggled(bool)), + this, TQ_SIGNAL(changed())); + connect(m_dialog->titleShadow, TQ_SIGNAL(toggled(bool)), + this, TQ_SIGNAL(changed())); + connect(m_dialog->coloredBorder, TQ_SIGNAL(toggled(bool)), + this, TQ_SIGNAL(changed())); } PlastikConfig::~PlastikConfig() diff --git a/twin/clients/plastik/plastikbutton.cpp b/twin/clients/plastik/plastikbutton.cpp index 5fdadc8e1..3f3f81f62 100644 --- a/twin/clients/plastik/plastikbutton.cpp +++ b/twin/clients/plastik/plastikbutton.cpp @@ -51,7 +51,7 @@ PlastikButton::PlastikButton(ButtonType type, PlastikClient *parent, const char // no need to reset here as the button will be resetted on first resize. animTmr = new TQTimer(this); - connect(animTmr, TQT_SIGNAL(timeout() ), this, TQT_SLOT(animate() ) ); + connect(animTmr, TQ_SIGNAL(timeout() ), this, TQ_SLOT(animate() ) ); animProgress = 0; } diff --git a/twin/clients/quartz/config/config.cpp b/twin/clients/quartz/config/config.cpp index 70dc87965..106ea28dc 100644 --- a/twin/clients/quartz/config/config.cpp +++ b/twin/clients/quartz/config/config.cpp @@ -49,8 +49,8 @@ QuartzConfig::QuartzConfig( TDEConfig* conf, TQWidget* parent ) load( conf ); // Ensure we track user changes properly - connect( cbColorBorder, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectionChanged()) ); - connect( cbExtraSmall, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectionChanged()) ); + connect( cbColorBorder, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSelectionChanged()) ); + connect( cbExtraSmall, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSelectionChanged()) ); // Make the widgets visible in twindecoration gb->show(); diff --git a/twin/clients/test/test.cpp b/twin/clients/test/test.cpp index e306520d5..0cf45a90b 100644 --- a/twin/clients/test/test.cpp +++ b/twin/clients/test/test.cpp @@ -24,7 +24,7 @@ void Decoration::init() button->show(); button->setCursor( TQt::arrowCursor ); button->move( 0, 0 ); - connect( button, TQT_SIGNAL( clicked()), TQT_SLOT( closeWindow())); + connect( button, TQ_SIGNAL( clicked()), TQ_SLOT( closeWindow())); TQToolTip::add( button, "Zelva Mana" ); } } diff --git a/twin/events.cpp b/twin/events.cpp index 166767239..3d3ba999c 100644 --- a/twin/events.cpp +++ b/twin/events.cpp @@ -886,7 +886,7 @@ void Client::enterNotifyEvent( XCrossingEvent* e ) { delete shadeHoverTimer; shadeHoverTimer = new TQTimer( this ); - connect( shadeHoverTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( shadeHover() )); + connect( shadeHoverTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( shadeHover() )); shadeHoverTimer->start( options->shadeHoverInterval, TRUE ); } @@ -899,7 +899,7 @@ void Client::enterNotifyEvent( XCrossingEvent* e ) { delete autoRaiseTimer; autoRaiseTimer = new TQTimer( this ); - connect( autoRaiseTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( autoRaise() ) ); + connect( autoRaiseTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( autoRaise() ) ); autoRaiseTimer->start( options->autoRaiseInterval, TRUE ); } diff --git a/twin/kcmtwin/twindecoration/buttons.cpp b/twin/kcmtwin/twindecoration/buttons.cpp index 40f63d981..0a3c6331e 100644 --- a/twin/kcmtwin/twindecoration/buttons.cpp +++ b/twin/kcmtwin/twindecoration/buttons.cpp @@ -689,11 +689,11 @@ ButtonPositionWidget::ButtonPositionWidget(TQWidget *parent, const char* name) layout->addWidget(m_dropSite); layout->addWidget(m_buttonSource); - connect( m_dropSite, TQT_SIGNAL(buttonAdded(TQChar)), m_buttonSource, TQT_SLOT(hideButton(TQChar)) ); - connect( m_dropSite, TQT_SIGNAL(buttonRemoved(TQChar)), m_buttonSource, TQT_SLOT(showButton(TQChar)) ); - connect( m_buttonSource, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*)), m_dropSite, TQT_SLOT(removeSelectedButton()) ); + connect( m_dropSite, TQ_SIGNAL(buttonAdded(TQChar)), m_buttonSource, TQ_SLOT(hideButton(TQChar)) ); + connect( m_dropSite, TQ_SIGNAL(buttonRemoved(TQChar)), m_buttonSource, TQ_SLOT(showButton(TQChar)) ); + connect( m_buttonSource, TQ_SIGNAL(dropped(TQDropEvent*, TQListViewItem*)), m_dropSite, TQ_SLOT(removeSelectedButton()) ); - connect( m_dropSite, TQT_SIGNAL(changed()), TQT_SIGNAL(changed()) ); + connect( m_dropSite, TQ_SIGNAL(changed()), TQ_SIGNAL(changed()) ); // insert all possible buttons into the source (backwards to keep the preferred order...) bool dummy; diff --git a/twin/kcmtwin/twindecoration/twindecoration.cpp b/twin/kcmtwin/twindecoration/twindecoration.cpp index 062ff6ac7..265fe2a1c 100644 --- a/twin/kcmtwin/twindecoration/twindecoration.cpp +++ b/twin/kcmtwin/twindecoration/twindecoration.cpp @@ -193,32 +193,32 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c cbShadowDocks = new TQCheckBox(i18n("Docks and &panels"), whichShadowSettings); - connect(cbShadowDocks, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(slotSelectionChanged())); + connect(cbShadowDocks, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(slotSelectionChanged())); cbShadowOverrides = new TQCheckBox(i18n("O&verride windows"), whichShadowSettings); - connect(cbShadowOverrides, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(slotSelectionChanged())); + connect(cbShadowOverrides, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(slotSelectionChanged())); cbShadowTopMenus = new TQCheckBox(i18n("&Top menu"), whichShadowSettings); - connect(cbShadowTopMenus, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(slotSelectionChanged())); + connect(cbShadowTopMenus, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(slotSelectionChanged())); cbInactiveShadow = new TQCheckBox( i18n("Draw shadow under &inactive windows"), inactiveShadowSettings); - connect(cbInactiveShadow, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(slotSelectionChanged())); + connect(cbInactiveShadow, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(slotSelectionChanged())); shadowColourHBox = new TQHBox(activeShadowSettings); shadowColourHBox->setSpacing(KDialog::spacingHint()); shadowColourLabel = new TQLabel(i18n("Colour:"), shadowColourHBox); shadowColourButton = new KColorButton(shadowColourHBox); - connect(shadowColourButton, TQT_SIGNAL(changed(const TQColor &)), TQT_SLOT(slotSelectionChanged())); + connect(shadowColourButton, TQ_SIGNAL(changed(const TQColor &)), TQ_SLOT(slotSelectionChanged())); inactiveShadowColourHBox = new TQHBox(inactiveShadowSettings); inactiveShadowColourHBox->setSpacing(KDialog::spacingHint()); inactiveShadowColourLabel = new TQLabel(i18n("Colour:"), inactiveShadowColourHBox); inactiveShadowColourButton = new KColorButton(inactiveShadowColourHBox); - connect(inactiveShadowColourButton, TQT_SIGNAL(changed(const TQColor &)), TQT_SLOT(slotSelectionChanged())); + connect(inactiveShadowColourButton, TQ_SIGNAL(changed(const TQColor &)), TQ_SLOT(slotSelectionChanged())); shadowOpacityHBox = new TQHBox(activeShadowSettings); shadowOpacityHBox->setSpacing(KDialog::spacingHint()); @@ -229,12 +229,12 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c shadowOpacitySlider->setTickInterval(10); shadowOpacitySpinBox = new TQSpinBox(1, 100, 1, shadowOpacityHBox); shadowOpacitySpinBox->setSuffix(" %"); - connect(shadowOpacitySlider, TQT_SIGNAL(valueChanged(int)), shadowOpacitySpinBox, - TQT_SLOT(setValue(int))); - connect(shadowOpacitySpinBox, TQT_SIGNAL(valueChanged(int)), shadowOpacitySlider, - TQT_SLOT(setValue(int))); - connect(shadowOpacitySlider, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotSelectionChanged())); + connect(shadowOpacitySlider, TQ_SIGNAL(valueChanged(int)), shadowOpacitySpinBox, + TQ_SLOT(setValue(int))); + connect(shadowOpacitySpinBox, TQ_SIGNAL(valueChanged(int)), shadowOpacitySlider, + TQ_SLOT(setValue(int))); + connect(shadowOpacitySlider, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotSelectionChanged())); inactiveShadowOpacityHBox = new TQHBox(inactiveShadowSettings); inactiveShadowOpacityHBox->setSpacing(KDialog::spacingHint()); @@ -247,14 +247,14 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c inactiveShadowOpacitySpinBox = new TQSpinBox(1, 100, 1, inactiveShadowOpacityHBox); inactiveShadowOpacitySpinBox->setSuffix(" %"); - connect(inactiveShadowOpacitySlider, TQT_SIGNAL(valueChanged(int)), + connect(inactiveShadowOpacitySlider, TQ_SIGNAL(valueChanged(int)), inactiveShadowOpacitySpinBox, - TQT_SLOT(setValue(int))); - connect(inactiveShadowOpacitySpinBox, TQT_SIGNAL(valueChanged(int)), + TQ_SLOT(setValue(int))); + connect(inactiveShadowOpacitySpinBox, TQ_SIGNAL(valueChanged(int)), inactiveShadowOpacitySlider, - TQT_SLOT(setValue(int))); - connect(inactiveShadowOpacitySlider, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotSelectionChanged())); + TQ_SLOT(setValue(int))); + connect(inactiveShadowOpacitySlider, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotSelectionChanged())); shadowXOffsetHBox = new TQHBox(activeShadowSettings); shadowXOffsetHBox->setSpacing(KDialog::spacingHint()); @@ -263,8 +263,8 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c shadowXOffsetHBox); shadowXOffsetSpinBox = new TQSpinBox(-1024, 1024, 1, shadowXOffsetHBox); shadowXOffsetSpinBox->setSuffix(i18n(" pixels")); - connect(shadowXOffsetSpinBox, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotSelectionChanged())); + connect(shadowXOffsetSpinBox, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotSelectionChanged())); inactiveShadowXOffsetHBox = new TQHBox(inactiveShadowSettings); inactiveShadowXOffsetHBox->setSpacing(KDialog::spacingHint()); @@ -274,8 +274,8 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c inactiveShadowXOffsetSpinBox = new TQSpinBox(-1024, 1024, 1, inactiveShadowXOffsetHBox); inactiveShadowXOffsetSpinBox->setSuffix(i18n(" pixels")); - connect(inactiveShadowXOffsetSpinBox, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotSelectionChanged())); + connect(inactiveShadowXOffsetSpinBox, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotSelectionChanged())); shadowYOffsetHBox = new TQHBox(activeShadowSettings); shadowYOffsetHBox->setSpacing(KDialog::spacingHint()); @@ -284,8 +284,8 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c shadowYOffsetHBox); shadowYOffsetSpinBox = new TQSpinBox(-1024, 1024, 1, shadowYOffsetHBox); shadowYOffsetSpinBox->setSuffix(i18n(" pixels")); - connect(shadowYOffsetSpinBox, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotSelectionChanged())); + connect(shadowYOffsetSpinBox, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotSelectionChanged())); inactiveShadowYOffsetHBox = new TQHBox(inactiveShadowSettings); inactiveShadowYOffsetHBox->setSpacing(KDialog::spacingHint()); @@ -295,8 +295,8 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c inactiveShadowYOffsetSpinBox = new TQSpinBox(-1024, 1024, 1, inactiveShadowYOffsetHBox); inactiveShadowYOffsetSpinBox->setSuffix(i18n(" pixels")); - connect(inactiveShadowYOffsetSpinBox, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotSelectionChanged())); + connect(inactiveShadowYOffsetSpinBox, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotSelectionChanged())); shadowThicknessHBox = new TQHBox(activeShadowSettings); shadowThicknessHBox->setSpacing(KDialog::spacingHint()); @@ -306,8 +306,8 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c shadowThicknessSpinBox = new TQSpinBox(1, 100, 1, shadowThicknessHBox); shadowThicknessSpinBox->setSuffix(i18n(" pixels")); - connect(shadowThicknessSpinBox, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotSelectionChanged())); + connect(shadowThicknessSpinBox, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotSelectionChanged())); inactiveShadowThicknessHBox = new TQHBox(inactiveShadowSettings); inactiveShadowThicknessHBox->setSpacing(KDialog::spacingHint()); @@ -317,8 +317,8 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c inactiveShadowThicknessSpinBox = new TQSpinBox(1, 100, 1, inactiveShadowThicknessHBox); inactiveShadowThicknessSpinBox->setSuffix(i18n(" pixels")); - connect(inactiveShadowThicknessSpinBox, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotSelectionChanged())); + connect(inactiveShadowThicknessSpinBox, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotSelectionChanged())); // Page 4 (WM selector) windowmanagerPage = new TQWidget( tabWidget ); @@ -355,25 +355,25 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c tabWidget->insertTab( shadowPage, i18n("&Shadows") ); tabWidget->insertTab( windowmanagerPage, i18n("&Window Manager") ); - connect( buttonPositionWidget, TQT_SIGNAL(changed()), this, TQT_SLOT(slotButtonsChanged()) ); // update preview etc. - connect( buttonPositionWidget, TQT_SIGNAL(changed()), this, TQT_SLOT(slotSelectionChanged()) ); // emit changed()... - connect( decorationList, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotSelectionChanged()) ); - connect( decorationList, TQT_SIGNAL(activated(const TQString&)), - TQT_SLOT(slotChangeDecoration(const TQString&)) ); - connect( cbUseCustomButtonPositions, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectionChanged()) ); - connect(cbUseCustomButtonPositions, TQT_SIGNAL(toggled(bool)), buttonPositionWidget, TQT_SLOT(setEnabled(bool))); - connect(cbUseCustomButtonPositions, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotButtonsChanged()) ); - connect(cbWindowShadow, TQT_SIGNAL(toggled(bool)), activeShadowSettings, TQT_SLOT(setEnabled(bool))); - connect(cbWindowShadow, TQT_SIGNAL(toggled(bool)), inactiveShadowSettings, TQT_SLOT(setEnabled(bool))); - connect(cbWindowShadow, TQT_SIGNAL(toggled(bool)), whichShadowSettings, TQT_SLOT(setEnabled(bool))); - - connect( cbShowToolTips, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectionChanged()) ); - connect( cbWindowShadow, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectionChanged()) ); - connect( cBorder, TQT_SIGNAL( activated( int )), TQT_SLOT( slotBorderChanged( int ))); -// connect( cbUseMiniWindows, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectionChanged()) ); - - connect( thirdpartyWMList, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotSelectionChanged()) ); - connect( thirdpartyWMArguments, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotSelectionChanged()) ); + connect( buttonPositionWidget, TQ_SIGNAL(changed()), this, TQ_SLOT(slotButtonsChanged()) ); // update preview etc. + connect( buttonPositionWidget, TQ_SIGNAL(changed()), this, TQ_SLOT(slotSelectionChanged()) ); // emit changed()... + connect( decorationList, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(slotSelectionChanged()) ); + connect( decorationList, TQ_SIGNAL(activated(const TQString&)), + TQ_SLOT(slotChangeDecoration(const TQString&)) ); + connect( cbUseCustomButtonPositions, TQ_SIGNAL(clicked()), TQ_SLOT(slotSelectionChanged()) ); + connect(cbUseCustomButtonPositions, TQ_SIGNAL(toggled(bool)), buttonPositionWidget, TQ_SLOT(setEnabled(bool))); + connect(cbUseCustomButtonPositions, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotButtonsChanged()) ); + connect(cbWindowShadow, TQ_SIGNAL(toggled(bool)), activeShadowSettings, TQ_SLOT(setEnabled(bool))); + connect(cbWindowShadow, TQ_SIGNAL(toggled(bool)), inactiveShadowSettings, TQ_SLOT(setEnabled(bool))); + connect(cbWindowShadow, TQ_SIGNAL(toggled(bool)), whichShadowSettings, TQ_SLOT(setEnabled(bool))); + + connect( cbShowToolTips, TQ_SIGNAL(clicked()), TQ_SLOT(slotSelectionChanged()) ); + connect( cbWindowShadow, TQ_SIGNAL(clicked()), TQ_SLOT(slotSelectionChanged()) ); + connect( cBorder, TQ_SIGNAL( activated( int )), TQ_SLOT( slotBorderChanged( int ))); +// connect( cbUseMiniWindows, TQ_SIGNAL(clicked()), TQ_SLOT(slotSelectionChanged()) ); + + connect( thirdpartyWMList, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(slotSelectionChanged()) ); + connect( thirdpartyWMArguments, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotSelectionChanged()) ); // Allow twin dcop signal to update our selection list connectDCOPSignal("twin", 0, "dcopResetAllClients()", "dcopUpdateClientList()", false); @@ -660,10 +660,10 @@ void KWinDecorationModule::resetPlugin( TDEConfig* conf, const TQString& current pluginObject = (TQObject*)(allocatePlugin( conf, pluginConfigWidget )); // connect required signals and slots together... - connect( pluginObject, TQT_SIGNAL(changed()), this, TQT_SLOT(slotSelectionChanged()) ); - connect( this, TQT_SIGNAL(pluginLoad(TDEConfig*)), pluginObject, TQT_SLOT(load(TDEConfig*)) ); - connect( this, TQT_SIGNAL(pluginSave(TDEConfig*)), pluginObject, TQT_SLOT(save(TDEConfig*)) ); - connect( this, TQT_SIGNAL(pluginDefaults()), pluginObject, TQT_SLOT(defaults()) ); + connect( pluginObject, TQ_SIGNAL(changed()), this, TQ_SLOT(slotSelectionChanged()) ); + connect( this, TQ_SIGNAL(pluginLoad(TDEConfig*)), pluginObject, TQ_SLOT(load(TDEConfig*)) ); + connect( this, TQ_SIGNAL(pluginSave(TDEConfig*)), pluginObject, TQ_SLOT(save(TDEConfig*)) ); + connect( this, TQ_SIGNAL(pluginDefaults()), pluginObject, TQ_SLOT(defaults()) ); pluginConfigWidget->show(); return; } diff --git a/twin/kcmtwin/twinoptions/main.cpp b/twin/kcmtwin/twinoptions/main.cpp index e55d5a15f..2ce258c3c 100644 --- a/twin/kcmtwin/twinoptions/main.cpp +++ b/twin/kcmtwin/twinoptions/main.cpp @@ -102,37 +102,37 @@ KWinOptions::KWinOptions(TQWidget *parent, const char *name) mFocus = new KFocusConfig(false, mConfig, this, "TWin Focus Config"); mFocus->layout()->setMargin( KDialog::marginHint() ); tab->addTab(mFocus, i18n("&Focus")); - connect(mFocus, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); + connect(mFocus, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); mTitleBarActions = new KTitleBarActionsConfig(false, mConfig, this, "TWin TitleBar Actions"); mTitleBarActions->layout()->setMargin( KDialog::marginHint() ); tab->addTab(mTitleBarActions, i18n("&Titlebar Actions")); - connect(mTitleBarActions, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); + connect(mTitleBarActions, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); mWindowActions = new KWindowActionsConfig(false, mConfig, this, "TWin Window Actions"); mWindowActions->layout()->setMargin( KDialog::marginHint() ); tab->addTab(mWindowActions, i18n("Window Actio&ns")); - connect(mWindowActions, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); + connect(mWindowActions, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); mMoving = new KMovingConfig(false, mConfig, this, "TWin Moving"); mMoving->layout()->setMargin( KDialog::marginHint() ); tab->addTab(mMoving, i18n("&Moving")); - connect(mMoving, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); + connect(mMoving, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); mABorders = new KActiveBorderConfig(false, mConfig, this, "TWin Active Borders"); mABorders->layout()->setMargin(KDialog::marginHint()); tab->addTab(mABorders, i18n("Active &Borders")); - connect(mABorders, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); + connect(mABorders, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); mAdvanced = new KAdvancedConfig(false, mConfig, this, "TWin Advanced"); mAdvanced->layout()->setMargin( KDialog::marginHint() ); tab->addTab(mAdvanced, i18n("Ad&vanced")); - connect(mAdvanced, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); + connect(mAdvanced, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); mTranslucency = new KTranslucencyConfig(false, mConfig, this, "TWin Translucency"); mTranslucency->layout()->setMargin( KDialog::marginHint() ); tab->addTab(mTranslucency, i18n("&Translucency")); - connect(mTranslucency, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); + connect(mTranslucency, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); TDEAboutData *about = new TDEAboutData(I18N_NOOP("kcmtwinoptions"), I18N_NOOP("Window Behavior Configuration Module"), @@ -266,12 +266,12 @@ TDEActionsOptions::TDEActionsOptions(TQWidget *parent, const char *name) mTitleBarActions = new KTitleBarActionsConfig(false, mConfig, this, "TWin TitleBar Actions"); mTitleBarActions->layout()->setMargin( KDialog::marginHint() ); tab->addTab(mTitleBarActions, i18n("&Titlebar Actions")); - connect(mTitleBarActions, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); + connect(mTitleBarActions, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); mWindowActions = new KWindowActionsConfig(false, mConfig, this, "TWin Window Actions"); mWindowActions->layout()->setMargin( KDialog::marginHint() ); tab->addTab(mWindowActions, i18n("Window Actio&ns")); - connect(mWindowActions, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); + connect(mWindowActions, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); } TDEActionsOptions::~TDEActionsOptions() diff --git a/twin/kcmtwin/twinoptions/mouse.cpp b/twin/kcmtwin/twinoptions/mouse.cpp index 3314604e7..0e197071c 100644 --- a/twin/kcmtwin/twinoptions/mouse.cpp +++ b/twin/kcmtwin/twinoptions/mouse.cpp @@ -164,7 +164,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, TDEConfig *_co combo->insertItem(i18n("On All Desktops")); combo->insertItem(i18n("Nothing")); combo->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed)); - connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); hlayout->addWidget(combo); coTiDbl = combo; TQWhatsThis::add(combo, i18n("Behavior on <em>double</em> click into the titlebar.")); @@ -189,14 +189,14 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, TDEConfig *_co comboW->insertItem(i18n("Change Opacity")); comboW->insertItem(i18n("Nothing")); comboW->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed)); - connect(comboW, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(comboW, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); hlayoutW->addWidget(comboW); coTiW = comboW; TQWhatsThis::add(comboW, txtButton4); label->setBuddy(comboW); cbTiRevW = new TQCheckBox(i18n("Reverse wheel direction"), this); - connect(cbTiRevW, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + connect(cbTiRevW, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); TQWhatsThis::add( cbTiRevW, i18n("Use this to reverse the action of the mouse wheel.") ); hlayoutW->addWidget(cbTiRevW); @@ -266,21 +266,21 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, TDEConfig *_co // Titlebar and frame, active, mouse button 1 combo = new TQComboBox(grid); combo->insertStringList(items); - connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); coTiAct1 = combo; TQWhatsThis::add(combo, txtButton1); // Titlebar and frame, active, mouse button 2 combo = new TQComboBox(grid); combo->insertStringList(items); - connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); coTiAct2 = combo; TQWhatsThis::add(combo, i18n("Behavior on <em>middle</em> click into the titlebar or frame of an <em>active</em> window.")); // Titlebar and frame, active, mouse button 3 combo = new TQComboBox(grid); combo->insertStringList(items); - connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); coTiAct3 = combo; TQWhatsThis::add(combo, txtButton3 ); @@ -310,19 +310,19 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, TDEConfig *_co combo = new TQComboBox(grid); combo->insertStringList(items); - connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); coTiInAct1 = combo; TQWhatsThis::add(combo, txtButton1); combo = new TQComboBox(grid); combo->insertStringList(items); - connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); coTiInAct2 = combo; TQWhatsThis::add(combo, i18n("Behavior on <em>middle</em> click into the titlebar or frame of an <em>inactive</em> window.")); combo = new TQComboBox(grid); combo->insertStringList(items); - connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); coTiInAct3 = combo; TQWhatsThis::add(combo, txtButton3); @@ -362,13 +362,13 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, TDEConfig *_co coMax[b] = new ToolTipComboBox(box, tbl_Max); for (int t = 0; t < 3; ++t) coMax[b]->insertItem(maxButtonPixmaps[t]); - connect(coMax[b], TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); - connect(coMax[b], TQT_SIGNAL(activated(int)), coMax[b], TQT_SLOT(changed())); + connect(coMax[b], TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); + connect(coMax[b], TQ_SIGNAL(activated(int)), coMax[b], TQ_SLOT(changed())); TQWhatsThis::add( coMax[b], txtButton[b] ); coMax[b]->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum )); } - connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(paletteChanged())); + connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(paletteChanged())); layout->addStretch(); @@ -655,19 +655,19 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, TDEConfig *_config TQComboBox* combo = new TQComboBox(grid); combo->insertStringList(items); - connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); coWin1 = combo; TQWhatsThis::add( combo, strWin1 ); combo = new TQComboBox(grid); combo->insertStringList(items); - connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); coWin2 = combo; TQWhatsThis::add( combo, strWin2 ); combo = new TQComboBox(grid); combo->insertStringList(items); - connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); coWin3 = combo; TQWhatsThis::add( combo, strWin3 ); @@ -727,7 +727,7 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, TDEConfig *_config combo = new TQComboBox(grid); combo->insertItem(i18n("Meta")); combo->insertItem(i18n("Alt")); - connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); coAllKey = combo; TQWhatsThis::add( combo, strAllKey ); @@ -743,19 +743,19 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, TDEConfig *_config combo = new TQComboBox(grid); combo->insertStringList(items); - connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); coAll1 = combo; TQWhatsThis::add( combo, strAll1 ); combo = new TQComboBox(grid); combo->insertStringList(items); - connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); coAll2 = combo; TQWhatsThis::add( combo, strAll2 ); combo = new TQComboBox(grid); combo->insertStringList(items); - connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); coAll3 = combo; TQWhatsThis::add( combo, strAll3 ); @@ -767,12 +767,12 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, TDEConfig *_config combo->insertItem(i18n("Move to Previous/Next Desktop")); combo->insertItem(i18n("Change Opacity")); combo->insertItem(i18n("Nothing")); - connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); coAllW = combo; TQWhatsThis::add( combo, strAllW ); cbAllRevW = new TQCheckBox(i18n("Reverse wheel direction"), grid); - connect(cbAllRevW, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + connect(cbAllRevW, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); TQWhatsThis::add( cbAllRevW, i18n("Use this to reverse the action of the mouse wheel.") ); layout->addStretch(); diff --git a/twin/kcmtwin/twinoptions/windows.cpp b/twin/kcmtwin/twinoptions/windows.cpp index 30d565716..9d8e8d617 100644 --- a/twin/kcmtwin/twinoptions/windows.cpp +++ b/twin/kcmtwin/twinoptions/windows.cpp @@ -169,12 +169,12 @@ KFocusConfig::KFocusConfig (bool _standAlone, TDEConfig *_config, TQWidget * par TQWhatsThis::add( focusCombo, wtstr); TQWhatsThis::add(fLabel, wtstr); - connect(focusCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setAutoRaiseEnabled()) ); + connect(focusCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setAutoRaiseEnabled()) ); // autoraise delay autoRaiseOn = new TQCheckBox(i18n("Auto &raise"), fcsBox); fLay->addWidget(autoRaiseOn); - connect(autoRaiseOn,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(autoRaiseOnTog(bool))); + connect(autoRaiseOn,TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(autoRaiseOnTog(bool))); autoRaise = new KIntNumInput(500, fcsBox); autoRaise->setLabel(i18n("Dela&y:"), TQt::AlignVCenter|TQt::AlignLeft); @@ -183,11 +183,11 @@ KFocusConfig::KFocusConfig (bool _standAlone, TDEConfig *_config, TQWidget * par autoRaise->setSuffix(i18n(" msec")); fLay->addWidget(autoRaise); - connect(focusCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setDelayFocusEnabled()) ); + connect(focusCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setDelayFocusEnabled()) ); delayFocusOn = new TQCheckBox(i18n("Delay focus"), fcsBox); fLay->addWidget(delayFocusOn); - connect(delayFocusOn,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(delayFocusOnTog(bool))); + connect(delayFocusOn,TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(delayFocusOnTog(bool))); delayFocus = new KIntNumInput(500, fcsBox); delayFocus->setLabel(i18n("Dela&y:"), TQt::AlignVCenter|TQt::AlignLeft); @@ -197,7 +197,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, TDEConfig *_config, TQWidget * par fLay->addWidget(delayFocus); clickRaiseOn = new TQCheckBox(i18n("Click &raises active window"), fcsBox); - connect(clickRaiseOn,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(clickRaiseOnTog(bool))); + connect(clickRaiseOn,TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(clickRaiseOnTog(bool))); fLay->addWidget(clickRaiseOn); // fLay->addColSpacing(0,TQMAX(autoRaiseOn->sizeHint().width(), @@ -263,7 +263,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, TDEConfig *_config, TQWidget * par " with the focused window. This option is by default disabled for Click to focus and" " enabled for other focus policies." ); TQWhatsThis::add( activeMouseScreen, wtstr ); - connect(focusCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateActiveMouseScreen())); + connect(focusCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateActiveMouseScreen())); if (!TQApplication::desktop()->isVirtualDesktop() || TQApplication::desktop()->numScreens() == 1) // No Ximerama @@ -291,7 +291,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, TDEConfig *_config, TQWidget * par " is pressed, with no popup widget. In addition, the previously" " activated window will be sent to the back in this mode."); TQWhatsThis::add( altTabPopup, wtstr ); - connect(focusCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateAltTabMode())); + connect(focusCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateAltTabMode())); traverseAll = new TQCheckBox( i18n( "&Traverse windows on all desktops" ), kbdBox ); kLay->addWidget( traverseAll ); @@ -319,17 +319,17 @@ KFocusConfig::KFocusConfig (bool _standAlone, TDEConfig *_config, TQWidget * par lay->addStretch(); // Any changes goes to slotChanged() - connect(focusCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); - connect(fcsBox, TQT_SIGNAL(clicked(int)), TQT_SLOT(changed())); - connect(autoRaise, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - connect(delayFocus, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - connect(separateScreenFocus, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); - connect(activeMouseScreen, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); - connect(altTabPopup, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); - connect(traverseAll, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); - connect(rollOverDesktops, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); - connect(showPopupinfo, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); - connect(focusStealing, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(focusCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); + connect(fcsBox, TQ_SIGNAL(clicked(int)), TQ_SLOT(changed())); + connect(autoRaise, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + connect(delayFocus, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + connect(separateScreenFocus, TQ_SIGNAL(clicked()), TQ_SLOT(changed())); + connect(activeMouseScreen, TQ_SIGNAL(clicked()), TQ_SLOT(changed())); + connect(altTabPopup, TQ_SIGNAL(clicked()), TQ_SLOT(changed())); + connect(traverseAll, TQ_SIGNAL(clicked()), TQ_SLOT(changed())); + connect(rollOverDesktops, TQ_SIGNAL(clicked()), TQ_SLOT(changed())); + connect(showPopupinfo, TQ_SIGNAL(clicked()), TQ_SLOT(changed())); + connect(focusStealing, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); load(); } @@ -686,15 +686,15 @@ KActiveBorderConfig::KActiveBorderConfig(bool _standAlone, TDEConfig *_config, T active_vbox->addSpacing(15); active_vbox->addWidget(tilingOpaque); - connect(active_box, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(updateActiveBorders())); + connect(active_box, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(updateActiveBorders())); // Any changes go to slotChanged() - connect(active_box, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(changed())); - connect(active_move, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); - connect(active_maximize, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); - connect(delays, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); - connect(distance, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); - connect(tilingOpaque, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); + connect(active_box, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(changed())); + connect(active_move, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); + connect(active_maximize, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); + connect(delays, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed())); + connect(distance, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed())); + connect(tilingOpaque, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); lay->addWidget(active_box); lay->addStretch(); @@ -860,7 +860,7 @@ KAdvancedConfig::KAdvancedConfig (bool _standAlone, TDEConfig *_config, TQWidget shadeHoverOn = new TQCheckBox(i18n("&Enable hover"), shBox); - connect(shadeHoverOn, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(shadeHoverChanged(bool))); + connect(shadeHoverOn, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(shadeHoverChanged(bool))); shadeHover = new KIntNumInput(500, shBox); shadeHover->setLabel(i18n("Dela&y:"), TQt::AlignVCenter|TQt::AlignLeft); @@ -878,16 +878,16 @@ KAdvancedConfig::KAdvancedConfig (bool _standAlone, TDEConfig *_config, TQWidget lay->addWidget(shBox); // Any changes goes to slotChanged() - connect(animateShade, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(shadeHoverOn, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(shadeHover, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); + connect(animateShade, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(shadeHoverOn, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(shadeHover, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); hideUtilityWindowsForInactive = new TQCheckBox( i18n( "Hide utility windows for inactive applications" ), this ); TQWhatsThis::add( hideUtilityWindowsForInactive, i18n( "When turned on, utility windows (tool windows, torn-off menus,…) of inactive applications will be" " hidden and will be shown only when the application becomes active. Note that applications" " have to mark the windows with the proper window type for this feature to work." )); - connect(hideUtilityWindowsForInactive, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + connect(hideUtilityWindowsForInactive, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); lay->addWidget( hideUtilityWindowsForInactive ); lay->addStretch(); @@ -1027,8 +1027,8 @@ KMovingConfig::KMovingConfig (bool _standAlone, TDEConfig *_config, TQWidget *pa minimizeAnimSlider->setTickmarks(TQSlider::Below); rLay->addMultiCellWidget(minimizeAnimSlider,0,0,1,2); - connect(minimizeAnimOn, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setMinimizeAnim(bool))); - connect(minimizeAnimSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setMinimizeAnimSpeed(int))); + connect(minimizeAnimOn, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setMinimizeAnim(bool))); + connect(minimizeAnimSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setMinimizeAnimSpeed(int))); minimizeAnimSlowLabel= new TQLabel(i18n("Slow"),windowsBox); minimizeAnimSlowLabel->setAlignment(TQt::AlignTop|TQt::AlignLeft); @@ -1143,19 +1143,19 @@ KMovingConfig::KMovingConfig (bool _standAlone, TDEConfig *_config, TQWidget *pa load(); // Any changes goes to slotChanged() - connect( moveOpaque, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); - connect( resizeOpaque, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); - connect( geometryTipOn, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); - connect( minimizeAnimOn, TQT_SIGNAL(clicked() ), TQT_SLOT(changed())); - connect( minimizeAnimSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - connect( moveResizeMaximized, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect( resetMaximizedWindowGeometry, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect( placementCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); - connect( BrdrSnap, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - connect( BrdrSnap, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotBrdrSnapChanged(int))); - connect( WndwSnap, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - connect( WndwSnap, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotWndwSnapChanged(int))); - connect( OverlapSnap, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); + connect( moveOpaque, TQ_SIGNAL(clicked()), TQ_SLOT(changed())); + connect( resizeOpaque, TQ_SIGNAL(clicked()), TQ_SLOT(changed())); + connect( geometryTipOn, TQ_SIGNAL(clicked()), TQ_SLOT(changed())); + connect( minimizeAnimOn, TQ_SIGNAL(clicked() ), TQ_SLOT(changed())); + connect( minimizeAnimSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + connect( moveResizeMaximized, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect( resetMaximizedWindowGeometry, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect( placementCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); + connect( BrdrSnap, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + connect( BrdrSnap, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotBrdrSnapChanged(int))); + connect( WndwSnap, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + connect( WndwSnap, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotWndwSnapChanged(int))); + connect( OverlapSnap, TQ_SIGNAL(clicked()), TQ_SLOT(changed())); // To get suffix to BrdrSnap and WndwSnap inputs with default values. slotBrdrSnapChanged(BrdrSnap->value()); @@ -1640,84 +1640,84 @@ KTranslucencyConfig::KTranslucencyConfig (bool _standAlone, TDEConfig *_config, lay->addWidget(useTranslucency); lay->addWidget(tabW); - connect(useTranslucency, TQT_SIGNAL(toggled(bool)), tabW, TQT_SLOT(setEnabled(bool))); - - connect(activeWindowTransparency, TQT_SIGNAL(toggled(bool)), activeWindowOpacity, TQT_SLOT(setEnabled(bool))); - connect(inactiveWindowTransparency, TQT_SIGNAL(toggled(bool)), inactiveWindowOpacity, TQT_SLOT(setEnabled(bool))); - connect(movingWindowTransparency, TQT_SIGNAL(toggled(bool)), movingWindowOpacity, TQT_SLOT(setEnabled(bool))); - connect(dockWindowTransparency, TQT_SIGNAL(toggled(bool)), dockWindowOpacity, TQT_SLOT(setEnabled(bool))); - - connect(useTranslucency, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(onlyDecoTranslucent, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(activeWindowTransparency, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(inactiveWindowTransparency, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(movingWindowTransparency, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(dockWindowTransparency, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(keepAboveAsActive, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(disableARGB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(useOpenGL, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(useOpenGL, TQT_SIGNAL(toggled(bool)), blurBackground, TQT_SLOT(setEnabled(bool))); - connect(blurBackground, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(useOpenGL, TQT_SIGNAL(toggled(bool)), greyscaleBackground, TQT_SLOT(setEnabled(bool))); - connect(greyscaleBackground, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(useShadows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(useShadowsOnMenuWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(useShadowsOnToolTipWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(useShadowsOnDockWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(removeShadowsOnResize, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(removeShadowsOnMove, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - - connect(activeWindowOpacity, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - connect(inactiveWindowOpacity, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - connect(movingWindowOpacity, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - connect(dockWindowOpacity, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - connect(dockWindowShadowSize, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - connect(menuWindowShadowSize, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - connect(activeWindowShadowSize, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - connect(inactiveWindowShadowSize, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - connect(baseShadowSize, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - connect(shadowTopOffset, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - connect(shadowLeftOffset, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - connect(shadowColor, TQT_SIGNAL(changed(const TQColor&)), TQT_SLOT(changed())); - connect(fadeInWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(fadeInMenuWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(fadeInToolTipWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(fadeOnOpacityChange, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(fadeInSpeed, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - connect(fadeOutSpeed, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - - connect(useShadows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(processShadowLockouts())); - connect(useShadowsOnMenuWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(processShadowLockouts())); - connect(useShadowsOnToolTipWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(processShadowLockouts())); - connect(useShadowsOnDockWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(processShadowLockouts())); + connect(useTranslucency, TQ_SIGNAL(toggled(bool)), tabW, TQ_SLOT(setEnabled(bool))); + + connect(activeWindowTransparency, TQ_SIGNAL(toggled(bool)), activeWindowOpacity, TQ_SLOT(setEnabled(bool))); + connect(inactiveWindowTransparency, TQ_SIGNAL(toggled(bool)), inactiveWindowOpacity, TQ_SLOT(setEnabled(bool))); + connect(movingWindowTransparency, TQ_SIGNAL(toggled(bool)), movingWindowOpacity, TQ_SLOT(setEnabled(bool))); + connect(dockWindowTransparency, TQ_SIGNAL(toggled(bool)), dockWindowOpacity, TQ_SLOT(setEnabled(bool))); + + connect(useTranslucency, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(onlyDecoTranslucent, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(activeWindowTransparency, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(inactiveWindowTransparency, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(movingWindowTransparency, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(dockWindowTransparency, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(keepAboveAsActive, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(disableARGB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(useOpenGL, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(useOpenGL, TQ_SIGNAL(toggled(bool)), blurBackground, TQ_SLOT(setEnabled(bool))); + connect(blurBackground, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(useOpenGL, TQ_SIGNAL(toggled(bool)), greyscaleBackground, TQ_SLOT(setEnabled(bool))); + connect(greyscaleBackground, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(useShadows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(useShadowsOnMenuWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(useShadowsOnToolTipWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(useShadowsOnDockWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(removeShadowsOnResize, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(removeShadowsOnMove, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + + connect(activeWindowOpacity, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + connect(inactiveWindowOpacity, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + connect(movingWindowOpacity, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + connect(dockWindowOpacity, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + connect(dockWindowShadowSize, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + connect(menuWindowShadowSize, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + connect(activeWindowShadowSize, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + connect(inactiveWindowShadowSize, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + connect(baseShadowSize, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + connect(shadowTopOffset, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + connect(shadowLeftOffset, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + connect(shadowColor, TQ_SIGNAL(changed(const TQColor&)), TQ_SLOT(changed())); + connect(fadeInWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(fadeInMenuWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(fadeInToolTipWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(fadeOnOpacityChange, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(fadeInSpeed, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + connect(fadeOutSpeed, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + + connect(useShadows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(processShadowLockouts())); + connect(useShadowsOnMenuWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(processShadowLockouts())); + connect(useShadowsOnToolTipWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(processShadowLockouts())); + connect(useShadowsOnDockWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(processShadowLockouts())); load(); tabW->setEnabled(useTranslucency->isChecked()); - connect(useTranslucency, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(showWarning(bool))); + connect(useTranslucency, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(showWarning(bool))); // handle kompmgr restarts if necessary - connect(useTranslucency, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr())); - connect(disableARGB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr())); - connect(useOpenGL, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr())); - connect(blurBackground, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr())); - connect(greyscaleBackground, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr())); - connect(useShadows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr())); - connect(useShadowsOnMenuWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr())); - connect(useShadowsOnToolTipWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr())); - connect(useShadowsOnDockWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr())); - connect(inactiveWindowShadowSize, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(resetKompmgr())); - connect(baseShadowSize, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(resetKompmgr())); - connect(shadowTopOffset, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(resetKompmgr())); - connect(shadowLeftOffset, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(resetKompmgr())); - connect(shadowColor, TQT_SIGNAL(changed(const TQColor&)), TQT_SLOT(resetKompmgr())); - connect(fadeInWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr())); - connect(fadeInMenuWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr())); - connect(fadeInToolTipWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr())); - connect(fadeOnOpacityChange, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr())); - connect(fadeInSpeed, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(resetKompmgr())); - connect(fadeOutSpeed, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(resetKompmgr())); + connect(useTranslucency, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr())); + connect(disableARGB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr())); + connect(useOpenGL, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr())); + connect(blurBackground, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr())); + connect(greyscaleBackground, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr())); + connect(useShadows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr())); + connect(useShadowsOnMenuWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr())); + connect(useShadowsOnToolTipWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr())); + connect(useShadowsOnDockWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr())); + connect(inactiveWindowShadowSize, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(resetKompmgr())); + connect(baseShadowSize, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(resetKompmgr())); + connect(shadowTopOffset, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(resetKompmgr())); + connect(shadowLeftOffset, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(resetKompmgr())); + connect(shadowColor, TQ_SIGNAL(changed(const TQColor&)), TQ_SLOT(resetKompmgr())); + connect(fadeInWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr())); + connect(fadeInMenuWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr())); + connect(fadeInToolTipWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr())); + connect(fadeOnOpacityChange, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr())); + connect(fadeInSpeed, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(resetKompmgr())); + connect(fadeOutSpeed, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(resetKompmgr())); } } diff --git a/twin/kcmtwin/twinrules/kcm.cpp b/twin/kcmtwin/twinrules/kcm.cpp index 6e7b54890..fb7451626 100644 --- a/twin/kcmtwin/twinrules/kcm.cpp +++ b/twin/kcmtwin/twinrules/kcm.cpp @@ -45,7 +45,7 @@ KCMRules::KCMRules( TQWidget *parent, const char *name ) TQVBoxLayout *layout = new TQVBoxLayout( this ); widget = new KCMRulesList( this ); layout->addWidget( widget ); - connect( widget, TQT_SIGNAL( changed( bool )), TQT_SLOT( moduleChanged( bool ))); + connect( widget, TQ_SIGNAL( changed( bool )), TQ_SLOT( moduleChanged( bool ))); TDEAboutData *about = new TDEAboutData(I18N_NOOP( "kcmtwinrules" ), I18N_NOOP( "Window-Specific Settings Configuration Module" ), 0, 0, TDEAboutData::License_GPL, I18N_NOOP( "(c) 2004 KWin and KControl Authors" )); diff --git a/twin/kcmtwin/twinrules/ruleslist.cpp b/twin/kcmtwin/twinrules/ruleslist.cpp index 8961874ae..a9238c178 100644 --- a/twin/kcmtwin/twinrules/ruleslist.cpp +++ b/twin/kcmtwin/twinrules/ruleslist.cpp @@ -33,22 +33,22 @@ KCMRulesList::KCMRulesList( TQWidget* parent, const char* name ) : KCMRulesListBase( parent, name ) { // connect both current/selected, so that current==selected (stupid TQListBox :( ) - connect( rules_listbox, TQT_SIGNAL( currentChanged( TQListBoxItem* )), - TQT_SLOT( activeChanged( TQListBoxItem*))); - connect( rules_listbox, TQT_SIGNAL( selectionChanged( TQListBoxItem* )), - TQT_SLOT( activeChanged( TQListBoxItem*))); - connect( new_button, TQT_SIGNAL( clicked()), - TQT_SLOT( newClicked())); - connect( modify_button, TQT_SIGNAL( clicked()), - TQT_SLOT( modifyClicked())); - connect( delete_button, TQT_SIGNAL( clicked()), - TQT_SLOT( deleteClicked())); - connect( moveup_button, TQT_SIGNAL( clicked()), - TQT_SLOT( moveupClicked())); - connect( movedown_button, TQT_SIGNAL( clicked()), - TQT_SLOT( movedownClicked())); - connect( rules_listbox, TQT_SIGNAL( doubleClicked ( TQListBoxItem * ) ), - TQT_SLOT( modifyClicked())); + connect( rules_listbox, TQ_SIGNAL( currentChanged( TQListBoxItem* )), + TQ_SLOT( activeChanged( TQListBoxItem*))); + connect( rules_listbox, TQ_SIGNAL( selectionChanged( TQListBoxItem* )), + TQ_SLOT( activeChanged( TQListBoxItem*))); + connect( new_button, TQ_SIGNAL( clicked()), + TQ_SLOT( newClicked())); + connect( modify_button, TQ_SIGNAL( clicked()), + TQ_SLOT( modifyClicked())); + connect( delete_button, TQ_SIGNAL( clicked()), + TQ_SLOT( deleteClicked())); + connect( moveup_button, TQ_SIGNAL( clicked()), + TQ_SLOT( moveupClicked())); + connect( movedown_button, TQ_SIGNAL( clicked()), + TQ_SLOT( movedownClicked())); + connect( rules_listbox, TQ_SIGNAL( doubleClicked ( TQListBoxItem * ) ), + TQ_SLOT( modifyClicked())); load(); } diff --git a/twin/kcmtwin/twinrules/ruleswidget.cpp b/twin/kcmtwin/twinrules/ruleswidget.cpp index 334001bf7..116ac8b41 100644 --- a/twin/kcmtwin/twinrules/ruleswidget.cpp +++ b/twin/kcmtwin/twinrules/ruleswidget.cpp @@ -41,9 +41,9 @@ namespace KWinInternal { #define SETUP( var, type ) \ - connect( enable_##var, TQT_SIGNAL( toggled( bool )), rule_##var, TQT_SLOT( setEnabled( bool ))); \ - connect( enable_##var, TQT_SIGNAL( toggled( bool )), this, TQT_SLOT( updateEnable##var())); \ - connect( rule_##var, TQT_SIGNAL( activated( int )), this, TQT_SLOT( updateEnable##var())); \ + connect( enable_##var, TQ_SIGNAL( toggled( bool )), rule_##var, TQ_SLOT( setEnabled( bool ))); \ + connect( enable_##var, TQ_SIGNAL( toggled( bool )), this, TQ_SLOT( updateEnable##var())); \ + connect( rule_##var, TQ_SIGNAL( activated( int )), this, TQ_SLOT( updateEnable##var())); \ TQWhatsThis::add( enable_##var, enableDesc ); \ TQWhatsThis::add( rule_##var, type##RuleDesc ); @@ -550,7 +550,7 @@ void RulesWidget::detectClicked() { assert( detect_dlg == NULL ); detect_dlg = new DetectDialog; - connect( detect_dlg, TQT_SIGNAL( detectionDone( bool )), this, TQT_SLOT( detected( bool ))); + connect( detect_dlg, TQ_SIGNAL( detectionDone( bool )), this, TQ_SLOT( detected( bool ))); detect_dlg->detect( 0 ); } @@ -702,7 +702,7 @@ Rules* RulesDialog::edit( Rules* r, WId window, bool show_hints ) if( window != 0 ) widget->prepareWindowSpecific( window ); if( show_hints ) - TQTimer::singleShot( 0, this, TQT_SLOT( displayHints())); + TQTimer::singleShot( 0, this, TQ_SLOT( displayHints())); exec(); return rules; } diff --git a/twin/lib/kcommondecoration.cpp b/twin/lib/kcommondecoration.cpp index 7d219ae7f..d8a22458b 100644 --- a/twin/lib/kcommondecoration.cpp +++ b/twin/lib/kcommondecoration.cpp @@ -122,8 +122,8 @@ void KCommonDecoration::init() resetLayout(); - connect(this, TQT_SIGNAL(keepAboveChanged(bool) ), TQT_SLOT(keepAboveChange(bool) ) ); - connect(this, TQT_SIGNAL(keepBelowChanged(bool) ), TQT_SLOT(keepBelowChange(bool) ) ); + connect(this, TQ_SIGNAL(keepAboveChanged(bool) ), TQ_SLOT(keepAboveChange(bool) ) ); + connect(this, TQ_SIGNAL(keepBelowChanged(bool) ), TQ_SLOT(keepBelowChange(bool) ) ); updateCaption(); } @@ -350,8 +350,8 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString if (!btn) break; btn->setTipText(i18n("Menu") ); btn->setRealizeButtons(TQt::LeftButton|TQt::RightButton); - connect(btn, TQT_SIGNAL(pressed()), TQT_SLOT(menuButtonPressed())); - connect(btn, TQT_SIGNAL(released()), this, TQT_SLOT(menuButtonReleased())); + connect(btn, TQ_SIGNAL(pressed()), TQ_SLOT(menuButtonPressed())); + connect(btn, TQ_SIGNAL(released()), this, TQ_SLOT(menuButtonReleased())); m_button[MenuButton] = btn; } @@ -366,7 +366,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString btn->setTipText(oad?i18n("Not on all desktops"):i18n("On all desktops") ); btn->setToggleButton(true); btn->setOn( oad ); - connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(toggleOnAllDesktops())); + connect(btn, TQ_SIGNAL(clicked()), TQ_SLOT(toggleOnAllDesktops())); m_button[OnAllDesktopsButton] = btn; } @@ -377,7 +377,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString btn = createButton(HelpButton); if (!btn) break; btn->setTipText(i18n("Help") ); - connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(showContextHelp())); + connect(btn, TQ_SIGNAL(clicked()), TQ_SLOT(showContextHelp())); m_button[HelpButton] = btn; } @@ -387,7 +387,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString btn = createButton(MinButton); if (!btn) break; btn->setTipText(i18n("Minimize") ); - connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(minimize())); + connect(btn, TQ_SIGNAL(clicked()), TQ_SLOT(minimize())); m_button[MinButton] = btn; } @@ -401,7 +401,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString btn->setTipText(max?i18n("Restore"):i18n("Maximize") ); btn->setToggleButton(true); btn->setOn( max ); - connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotMaximize())); + connect(btn, TQ_SIGNAL(clicked()), TQ_SLOT(slotMaximize())); m_button[MaxButton] = btn; } @@ -411,7 +411,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString btn = createButton(CloseButton); if (!btn) break; btn->setTipText(i18n("Close") ); - connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(closeWindow())); + connect(btn, TQ_SIGNAL(clicked()), TQ_SLOT(closeWindow())); m_button[CloseButton] = btn; } @@ -424,7 +424,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString btn->setTipText(above?i18n("Do not keep above others"):i18n("Keep above others") ); btn->setToggleButton(true); btn->setOn( above ); - connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotKeepAbove())); + connect(btn, TQ_SIGNAL(clicked()), TQ_SLOT(slotKeepAbove())); m_button[AboveButton] = btn; } @@ -437,7 +437,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString btn->setTipText(below?i18n("Do not keep below others"):i18n("Keep below others") ); btn->setToggleButton(true); btn->setOn( below ); - connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotKeepBelow())); + connect(btn, TQ_SIGNAL(clicked()), TQ_SLOT(slotKeepBelow())); m_button[BelowButton] = btn; } @@ -450,7 +450,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString btn->setTipText(shaded?i18n("Unshade"):i18n("Shade") ); btn->setToggleButton(true); btn->setOn( shaded ); - connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotShade())); + connect(btn, TQ_SIGNAL(clicked()), TQ_SLOT(slotShade())); m_button[ShadeButton] = btn; } diff --git a/twin/main.cpp b/twin/main.cpp index 4af065a8a..61fb82847 100644 --- a/twin/main.cpp +++ b/twin/main.cpp @@ -146,7 +146,7 @@ Application::Application( ) ::exit(1); } } - connect( &owner, TQT_SIGNAL( lostOwnership()), TQT_SLOT( lostSelection())); + connect( &owner, TQ_SIGNAL( lostOwnership()), TQ_SLOT( lostSelection())); // if there was already twin running, it saved its configuration after loosing the selection -> reread config()->reparseConfiguration(); diff --git a/twin/popupinfo.cpp b/twin/popupinfo.cpp index c347991fe..d86037a84 100644 --- a/twin/popupinfo.cpp +++ b/twin/popupinfo.cpp @@ -39,7 +39,7 @@ PopupInfo::PopupInfo( Workspace* ws, const char *name ) m_shown = false; reset(); reconfigure(); - connect(&m_delayedHideTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(hide())); + connect(&m_delayedHideTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(hide())); TQFont f = font(); f.setBold( TRUE ); diff --git a/twin/rules.cpp b/twin/rules.cpp index 63fc0e37b..7bd2cd469 100644 --- a/twin/rules.cpp +++ b/twin/rules.cpp @@ -1008,7 +1008,7 @@ void Workspace::gotTemporaryRulesMessage( const TQString& message ) Rules* rule = new Rules( message, true ); rules.prepend( rule ); // highest priority first if( !was_temporary ) - TQTimer::singleShot( 60000, this, TQT_SLOT( cleanupTemporaryRules())); + TQTimer::singleShot( 60000, this, TQ_SLOT( cleanupTemporaryRules())); } void Workspace::cleanupTemporaryRules() @@ -1028,7 +1028,7 @@ void Workspace::cleanupTemporaryRules() } } if( has_temporary ) - TQTimer::singleShot( 60000, this, TQT_SLOT( cleanupTemporaryRules())); + TQTimer::singleShot( 60000, this, TQ_SLOT( cleanupTemporaryRules())); } void Workspace::discardUsedWindowRules( Client* c, bool withdrawn ) diff --git a/twin/sm.cpp b/twin/sm.cpp index 316322edd..00cdb6a22 100644 --- a/twin/sm.cpp +++ b/twin/sm.cpp @@ -417,7 +417,7 @@ SessionSaveDoneHelper::SessionSaveDoneHelper() SmcSetProperties( conn, 5, p ); notifier = new TQSocketNotifier( IceConnectionNumber( SmcGetIceConnection( conn )), TQSocketNotifier::Read, this ); - connect( notifier, TQT_SIGNAL( activated( int )), TQT_SLOT( processData())); + connect( notifier, TQ_SIGNAL( activated( int )), TQ_SLOT( processData())); } SessionSaveDoneHelper::~SessionSaveDoneHelper() diff --git a/twin/tabbox.cpp b/twin/tabbox.cpp index bec7cce97..feca2d77d 100644 --- a/twin/tabbox.cpp +++ b/twin/tabbox.cpp @@ -53,7 +53,7 @@ TabBox::TabBox( Workspace *ws, const char *name ) m = DesktopMode; // init variables reconfigure(); reset(); - connect(&delayedShowTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(show())); + connect(&delayedShowTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(show())); XSetWindowAttributes attr; attr.override_redirect = 1; diff --git a/twin/tools/decobenchmark/main.cpp b/twin/tools/decobenchmark/main.cpp index c4efddace..d4930ee84 100644 --- a/twin/tools/decobenchmark/main.cpp +++ b/twin/tools/decobenchmark/main.cpp @@ -130,7 +130,7 @@ int main(int argc, char** argv) DecoBenchApplication app(library, test, count); - TQTimer::singleShot(0, &app, TQT_SLOT(executeTest())); + TQTimer::singleShot(0, &app, TQ_SLOT(executeTest())); app.exec(); } #include "main.moc" diff --git a/twin/twinbindings.cpp b/twin/twinbindings.cpp index 08d6bf0d1..7e918f49f 100644 --- a/twin/twinbindings.cpp +++ b/twin/twinbindings.cpp @@ -1,8 +1,8 @@ #ifndef NOSLOTS # define DEF2( name, descr, key3, key4, fnSlot ) \ - keys->insert( name, i18n(descr), TQString::null, key3, key4, this, TQT_SLOT(fnSlot) ) + keys->insert( name, i18n(descr), TQString::null, key3, key4, this, TQ_SLOT(fnSlot) ) # define DEF( name, key3, key4, fnSlot ) \ - keys->insert( name, i18n(name), TQString::null, key3, key4, this, TQT_SLOT(fnSlot) ) + keys->insert( name, i18n(name), TQString::null, key3, key4, this, TQ_SLOT(fnSlot) ) #else # define DEF2( name, descr, key3, key4, fnSlot ) \ keys->insert( name, i18n(descr), TQString::null, key3, key4 ) diff --git a/twin/useractions.cpp b/twin/useractions.cpp index dd29025db..ac017aacf 100644 --- a/twin/useractions.cpp +++ b/twin/useractions.cpp @@ -51,13 +51,13 @@ TQPopupMenu* Workspace::clientPopup() popup = new TQPopupMenu; popup->setCheckable( TRUE ); popup->setFont(TDEGlobalSettings::menuFont()); - connect( popup, TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( clientPopupAboutToShow() ) ); - connect( popup, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( clientPopupActivated(int) ) ); + connect( popup, TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( clientPopupAboutToShow() ) ); + connect( popup, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( clientPopupActivated(int) ) ); advanced_popup = new TQPopupMenu( popup ); advanced_popup->setCheckable( TRUE ); advanced_popup->setFont(TDEGlobalSettings::menuFont()); - connect( advanced_popup, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( clientPopupActivated(int) ) ); + connect( advanced_popup, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( clientPopupActivated(int) ) ); advanced_popup->insertItem( SmallIconSet( "go-up" ), i18n("Keep &Above Others")+'\t'+keys->shortcut("Window Above Other Windows").seq(0).toString(), Options::KeepAboveOp ); advanced_popup->insertItem( SmallIconSet( "go-down" ), @@ -85,11 +85,11 @@ TQPopupMenu* Workspace::clientPopup() TQToolTip::add(transButton, i18n("Reset opacity to default value")); transSlider = new TQSlider(0, 100, 1, 100, TQt::Horizontal, transBox, "transSlider"); TQToolTip::add(transSlider, i18n("Slide this to set the window's opacity")); - connect(transButton, TQT_SIGNAL(clicked()), TQT_SLOT(resetClientOpacity())); - connect(transButton, TQT_SIGNAL(clicked()), trans_popup, TQT_SLOT(hide())); - connect(transSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(setTransButtonText(int))); - connect(transSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setPopupClientOpacity(int))); -// connect(transSlider, TQT_SIGNAL(sliderReleased()), trans_popup, TQT_SLOT(hide())); + connect(transButton, TQ_SIGNAL(clicked()), TQ_SLOT(resetClientOpacity())); + connect(transButton, TQ_SIGNAL(clicked()), trans_popup, TQ_SLOT(hide())); + connect(transSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(setTransButtonText(int))); + connect(transSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setPopupClientOpacity(int))); +// connect(transSlider, TQ_SIGNAL(sliderReleased()), trans_popup, TQ_SLOT(hide())); trans_popup->insertItem(transBox); popup->insertItem(i18n("&Opacity"), trans_popup ); } @@ -105,7 +105,7 @@ TQPopupMenu* Workspace::clientPopup() if (!TDEGlobal::config()->isImmutable() && !kapp->authorizeControlModules(Workspace::configModules(true)).isEmpty()) { - popup->insertItem(SmallIconSet( "configure" ), i18n("Configur&e Window Behavior…"), this, TQT_SLOT( configureWM() )); + popup->insertItem(SmallIconSet( "configure" ), i18n("Configur&e Window Behavior…"), this, TQ_SLOT( configureWM() )); popup->insertSeparator(); } @@ -201,10 +201,10 @@ void Workspace::initDesktopPopup() desk_popup = new TQPopupMenu( popup ); desk_popup->setCheckable( TRUE ); desk_popup->setFont(TDEGlobalSettings::menuFont()); - connect( desk_popup, TQT_SIGNAL( activated(int) ), - this, TQT_SLOT( slotSendToDesktop(int) ) ); - connect( desk_popup, TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( desktopPopupAboutToShow() ) ); + connect( desk_popup, TQ_SIGNAL( activated(int) ), + this, TQ_SLOT( slotSendToDesktop(int) ) ); + connect( desk_popup, TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( desktopPopupAboutToShow() ) ); popup->insertItem(i18n("To &Desktop"), desk_popup, -1, desk_popup_index ); } @@ -299,7 +299,7 @@ void Workspace::setupWindowShortcut( Client* c ) client_keys->suspend( true ); client_keys_dialog = new ShortcutDialog( c->shortcut()); client_keys_client = c; - connect( client_keys_dialog, TQT_SIGNAL( dialogDone( bool )), TQT_SLOT( setupWindowShortcutDone( bool ))); + connect( client_keys_dialog, TQ_SIGNAL( dialogDone( bool )), TQ_SLOT( setupWindowShortcutDone( bool ))); TQRect r = clientArea( ScreenArea, c ); TQSize size = client_keys_dialog->sizeHint(); TQPoint pos = c->pos() + c->clientPos(); @@ -336,7 +336,7 @@ void Workspace::clientShortcutUpdated( Client* c ) { client_keys->insert( key, key ); client_keys->setShortcut( key, c->shortcut()); - client_keys->setSlot( key, c, TQT_SLOT( shortcutActivated())); + client_keys->setSlot( key, c, TQ_SLOT( shortcutActivated())); client_keys->setActionEnabled( key, true ); } client_keys->updateConnections(); diff --git a/twin/workspace.cpp b/twin/workspace.cpp index 5f75edd90..3a3273a05 100644 --- a/twin/workspace.cpp +++ b/twin/workspace.cpp @@ -195,9 +195,9 @@ Workspace::Workspace( bool restore ) active_windows[i] = None; } - connect( &temporaryRulesMessages, TQT_SIGNAL( gotMessage( const TQString& )), - this, TQT_SLOT( gotTemporaryRulesMessage( const TQString& ))); - connect( &rulesUpdatedTimer, TQT_SIGNAL( timeout()), this, TQT_SLOT( writeWindowRules())); + connect( &temporaryRulesMessages, TQ_SIGNAL( gotMessage( const TQString& )), + this, TQ_SLOT( gotTemporaryRulesMessage( const TQString& ))); + connect( &rulesUpdatedTimer, TQ_SIGNAL( timeout()), this, TQ_SLOT( writeWindowRules())); updateXTime(); // needed for proper initialization of user_time in Client ctor @@ -259,7 +259,7 @@ Workspace::Workspace( bool restore ) init(); #if (TQT_VERSION-0 >= 0x030200) // XRANDR support - connect( kapp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized())); + connect( kapp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( desktopResized())); #endif if (!supportsCompMgr()) { @@ -274,7 +274,7 @@ Workspace::Workspace( bool restore ) if (options->useTranslucency) { kompmgr = new TDEProcess; - connect(kompmgr, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), TQT_SLOT(handleKompmgrOutput(TDEProcess*, char*, int))); + connect(kompmgr, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), TQ_SLOT(handleKompmgrOutput(TDEProcess*, char*, int))); *kompmgr << TDE_COMPOSITOR_BINARY; if (kompmgrpid) { @@ -427,15 +427,15 @@ void Workspace::init() // now we know how many desktops we'll, thus, we initialise the positioning object initPositioning = new Placement(this); - connect(&reconfigureTimer, TQT_SIGNAL(timeout()), this, - TQT_SLOT(slotReconfigure())); - connect( &updateToolWindowsTimer, TQT_SIGNAL( timeout()), this, TQT_SLOT( slotUpdateToolWindows())); + connect(&reconfigureTimer, TQ_SIGNAL(timeout()), this, + TQ_SLOT(slotReconfigure())); + connect( &updateToolWindowsTimer, TQ_SIGNAL( timeout()), this, TQ_SLOT( slotUpdateToolWindows())); - connect(kapp, TQT_SIGNAL(appearanceChanged()), this, - TQT_SLOT(slotReconfigure())); - connect(kapp, TQT_SIGNAL(settingsChanged(int)), this, - TQT_SLOT(slotSettingsChanged(int))); - connect(kapp, TQT_SIGNAL( kipcMessage( int, int )), this, TQT_SLOT( kipcMessage( int, int ))); + connect(kapp, TQ_SIGNAL(appearanceChanged()), this, + TQ_SLOT(slotReconfigure())); + connect(kapp, TQ_SIGNAL(settingsChanged(int)), this, + TQ_SLOT(slotSettingsChanged(int))); + connect(kapp, TQ_SIGNAL( kipcMessage( int, int )), this, TQ_SLOT( kipcMessage( int, int ))); active_client = NULL; rootInfo->setActiveWindow( None ); @@ -1188,10 +1188,10 @@ void Workspace::slotReconfigure() if (!kompmgr) { kompmgr = new TDEProcess; - connect(kompmgr, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), TQT_SLOT(handleKompmgrOutput(TDEProcess*, char*, int))); + connect(kompmgr, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), TQ_SLOT(handleKompmgrOutput(TDEProcess*, char*, int))); *kompmgr << TDE_COMPOSITOR_BINARY; } - TQTimer::singleShot( 200, this, TQT_SLOT(startKompmgr()) ); // wait some time to ensure system's ready for restart + TQTimer::singleShot( 200, this, TQ_SLOT(startKompmgr()) ); // wait some time to ensure system's ready for restart } } else @@ -2396,7 +2396,7 @@ void Workspace::requestDelayFocus( Client* c ) delayfocus_client = c; delete delayFocusTimer; delayFocusTimer = new TQTimer( this ); - connect( delayFocusTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( delayFocus() ) ); + connect( delayFocusTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( delayFocus() ) ); delayFocusTimer->start( options->delayFocusInterval, TRUE ); } @@ -2506,7 +2506,7 @@ void Workspace::reserveActiveBorder( ActiveBorder border ) return; if (active_reserved[border]++ == 0) - TQTimer::singleShot(0, this, TQT_SLOT(updateActiveBorders())); + TQTimer::singleShot(0, this, TQ_SLOT(updateActiveBorders())); } void Workspace::unreserveActiveBorder( ActiveBorder border ) @@ -2516,7 +2516,7 @@ void Workspace::unreserveActiveBorder( ActiveBorder border ) assert(active_reserved[ border ] > 0); if (--active_reserved[ border ] == 0) - TQTimer::singleShot(0, this, TQT_SLOT(updateActiveBorders())); + TQTimer::singleShot(0, this, TQ_SLOT(updateActiveBorders())); } void Workspace::checkActiveBorder(const TQPoint &pos, Time now) @@ -2788,12 +2788,12 @@ void Workspace::lostTopMenuSelection() { // kdDebug() << "lost TopMenu selection" << endl; // make sure this signal is always set when not owning the selection - disconnect( topmenu_watcher, TQT_SIGNAL( lostOwner()), this, TQT_SLOT( lostTopMenuOwner())); - connect( topmenu_watcher, TQT_SIGNAL( lostOwner()), this, TQT_SLOT( lostTopMenuOwner())); + disconnect( topmenu_watcher, TQ_SIGNAL( lostOwner()), this, TQ_SLOT( lostTopMenuOwner())); + connect( topmenu_watcher, TQ_SIGNAL( lostOwner()), this, TQ_SLOT( lostTopMenuOwner())); if( !managing_topmenus ) return; - connect( topmenu_watcher, TQT_SIGNAL( lostOwner()), this, TQT_SLOT( lostTopMenuOwner())); - disconnect( topmenu_selection, TQT_SIGNAL( lostOwnership()), this, TQT_SLOT( lostTopMenuSelection())); + connect( topmenu_watcher, TQ_SIGNAL( lostOwner()), this, TQ_SLOT( lostTopMenuOwner())); + disconnect( topmenu_selection, TQ_SIGNAL( lostOwnership()), this, TQ_SLOT( lostTopMenuSelection())); managing_topmenus = false; delete topmenu_space; topmenu_space = NULL; @@ -2822,8 +2822,8 @@ void Workspace::setupTopMenuHandling() { if( managing_topmenus ) return; - connect( topmenu_selection, TQT_SIGNAL( lostOwnership()), this, TQT_SLOT( lostTopMenuSelection())); - disconnect( topmenu_watcher, TQT_SIGNAL( lostOwner()), this, TQT_SLOT( lostTopMenuOwner())); + connect( topmenu_selection, TQ_SIGNAL( lostOwnership()), this, TQ_SLOT( lostTopMenuSelection())); + disconnect( topmenu_watcher, TQ_SIGNAL( lostOwner()), this, TQ_SLOT( lostTopMenuOwner())); managing_topmenus = true; topmenu_space = new TQWidget; Window stack[ 2 ]; @@ -2934,7 +2934,7 @@ void Workspace::startKompmgr() } else { // Try again a bit later! - TQTimer::singleShot( 200, this, TQT_SLOT(startKompmgr()) ); + TQTimer::singleShot( 200, this, TQ_SLOT(startKompmgr()) ); return; } pid_t kompmgrpid = getCompositorPID(); @@ -2962,12 +2962,12 @@ void Workspace::startKompmgr() char selection_name[ 100 ]; sprintf( selection_name, "_NET_WM_CM_S%d", DefaultScreen( tqt_xdisplay())); kompmgr_selection = new TDESelectionOwner( selection_name ); - connect( kompmgr_selection, TQT_SIGNAL( lostOwnership()), TQT_SLOT( stopKompmgr())); + connect( kompmgr_selection, TQ_SIGNAL( lostOwnership()), TQ_SLOT( stopKompmgr())); kompmgr_selection->claim( true ); - connect(kompmgr, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(restartKompmgr(TDEProcess*))); + connect(kompmgr, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(restartKompmgr(TDEProcess*))); options->useTranslucency = TRUE; //allowKompmgrRestart = FALSE; - //TQTimer::singleShot( 60000, this, TQT_SLOT(unblockKompmgrRestart()) ); + //TQTimer::singleShot( 60000, this, TQ_SLOT(unblockKompmgrRestart()) ); TQByteArray ba; TQDataStream arg(ba, IO_WriteOnly); arg << ""; @@ -2983,7 +2983,7 @@ void Workspace::stopKompmgr() } delete kompmgr_selection; kompmgr_selection = NULL; - kompmgr->disconnect(this, TQT_SLOT(restartKompmgr(TDEProcess*))); + kompmgr->disconnect(this, TQ_SLOT(restartKompmgr(TDEProcess*))); options->useTranslucency = FALSE; if (popup){ delete popup; popup = 0L; } // to add/remove opacity slider kompmgr->kill(SIGKILL); @@ -3012,7 +3012,7 @@ void Workspace::unblockKompmgrRestart() } void Workspace::restartKompmgr( TDEProcess *proc ) -// this is for inernal purpose (crashhandling) only, usually you want to use workspace->stopKompmgr(); TQTimer::singleShot(200, workspace, TQT_SLOT(startKompmgr())); +// this is for inernal purpose (crashhandling) only, usually you want to use workspace->stopKompmgr(); TQTimer::singleShot(200, workspace, TQ_SLOT(startKompmgr())); { bool crashed; if (proc->signalled()) { // looks like kompmgr may have crashed @@ -3061,7 +3061,7 @@ void Workspace::restartKompmgr( TDEProcess *proc ) else { allowKompmgrRestart = FALSE; - TQTimer::singleShot( 60000, this, TQT_SLOT(unblockKompmgrRestart()) ); + TQTimer::singleShot( 60000, this, TQ_SLOT(unblockKompmgrRestart()) ); } } } @@ -3088,7 +3088,7 @@ void Workspace::handleKompmgrOutput( TDEProcess* , char *buffer, int buflen) else return; //skip others // kompmgr startup failed or succeeded, release connection kompmgr->closeStderr(); - disconnect(kompmgr, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), this, TQT_SLOT(handleKompmgrOutput(TDEProcess*, char*, int))); + disconnect(kompmgr, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), this, TQ_SLOT(handleKompmgrOutput(TDEProcess*, char*, int))); if( !message.isEmpty()) { TDEProcess proc; |