From 1c65be77cd84b454f3fe69f211849a712ad99ed0 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 12 Jan 2024 10:51:50 +0900 Subject: Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines Signed-off-by: Michele Calgaro (cherry picked from commit a4241b7911d2e0b36edfb02f616b8b282050c0ec) --- tdm/kfrontend/kchooser.cpp | 12 ++++++------ tdm/kfrontend/kconsole.cpp | 2 +- tdm/kfrontend/kfdialog.cpp | 2 +- tdm/kfrontend/kgapp.cpp | 2 +- tdm/kfrontend/kgdialog.cpp | 28 +++++++++++++------------- tdm/kfrontend/kgreeter.cpp | 34 ++++++++++++++++---------------- tdm/kfrontend/kgverify.cpp | 16 +++++++-------- tdm/kfrontend/krootimage.cpp | 4 ++-- tdm/kfrontend/sakdlg.cpp | 10 +++++----- tdm/kfrontend/tdmadmindialog.cpp | 6 +++--- tdm/kfrontend/tdmclock.cpp | 2 +- tdm/kfrontend/tdmshutdown.cpp | 40 +++++++++++++++++++------------------- tdm/kfrontend/themer/tdmitem.cpp | 14 ++++++------- tdm/kfrontend/themer/tdmlabel.cpp | 4 ++-- tdm/kfrontend/themer/tdmthemer.cpp | 12 ++++++------ 15 files changed, 94 insertions(+), 94 deletions(-) (limited to 'tdm/kfrontend') diff --git a/tdm/kfrontend/kchooser.cpp b/tdm/kfrontend/kchooser.cpp index 3076d4a3c..876f42c88 100644 --- a/tdm/kfrontend/kchooser.cpp +++ b/tdm/kfrontend/kchooser.cpp @@ -75,7 +75,7 @@ ChooserDlg::ChooserDlg() iline->setEnabled( TRUE ); TQLabel *itxt = new TQLabel( iline, i18n("Hos&t:"), this ); TQPushButton *addButton = new TQPushButton( i18n("A&dd"), this ); - connect( addButton, TQT_SIGNAL(clicked()), TQT_SLOT(addHostname()) ); + connect( addButton, TQ_SIGNAL(clicked()), TQ_SLOT(addHostname()) ); TQBoxLayout *hibox = new TQHBoxLayout( vbox, 10 ); hibox->addWidget( itxt ); hibox->addWidget( iline ); @@ -107,12 +107,12 @@ ChooserDlg::ChooserDlg() #endif sn = new TQSocketNotifier( rfd, TQSocketNotifier::Read, this ); - connect( sn, TQT_SIGNAL(activated( int )), TQT_SLOT(slotReadPipe()) ); + connect( sn, TQ_SIGNAL(activated( int )), TQ_SLOT(slotReadPipe()) ); - connect( pingButton, TQT_SIGNAL(clicked()), TQT_SLOT(pingHosts()) ); - connect( acceptButton, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); -// connect( helpButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotHelp()) ); - connect( host_view, TQT_SIGNAL(doubleClicked(TQListViewItem *)), TQT_SLOT(accept()) ); + connect( pingButton, TQ_SIGNAL(clicked()), TQ_SLOT(pingHosts()) ); + connect( acceptButton, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); +// connect( helpButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotHelp()) ); + connect( host_view, TQ_SIGNAL(doubleClicked(TQListViewItem *)), TQ_SLOT(accept()) ); adjustGeometry(); } diff --git a/tdm/kfrontend/kconsole.cpp b/tdm/kfrontend/kconsole.cpp index bf1560aed..d47576c12 100644 --- a/tdm/kfrontend/kconsole.cpp +++ b/tdm/kfrontend/kconsole.cpp @@ -129,7 +129,7 @@ KConsole::OpenConsole() gotcon: notifier = new TQSocketNotifier( fd, TQSocketNotifier::Read, this ); - connect( notifier, TQT_SIGNAL(activated( int )), TQT_SLOT(slotData()) ); + connect( notifier, TQ_SIGNAL(activated( int )), TQ_SLOT(slotData()) ); return 1; } diff --git a/tdm/kfrontend/kfdialog.cpp b/tdm/kfrontend/kfdialog.cpp index 428b2ce09..30ee85a00 100644 --- a/tdm/kfrontend/kfdialog.cpp +++ b/tdm/kfrontend/kfdialog.cpp @@ -178,7 +178,7 @@ KFMsgBox::KFMsgBox( TQWidget *parent, TQMessageBox::Icon type, const TQString &t KPushButton *button = new KPushButton( KStdGuiItem::ok(), this ); button->setDefault( true ); button->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); - connect( button, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); + connect( button, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); TQGridLayout *grid = new TQGridLayout( this, 2, 2, 10 ); grid->addWidget( label1, 0, 0, TQt::AlignCenter ); diff --git a/tdm/kfrontend/kgapp.cpp b/tdm/kfrontend/kgapp.cpp index c7d694608..6e144600f 100644 --- a/tdm/kfrontend/kgapp.cpp +++ b/tdm/kfrontend/kgapp.cpp @@ -126,7 +126,7 @@ void GreeterApp::init() #ifdef WITH_TDEHWLIB TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); - connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*))); + connect(hwdevices, TQ_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQ_SLOT(deviceChanged(TDEGenericDevice*))); #endif } diff --git a/tdm/kfrontend/kgdialog.cpp b/tdm/kfrontend/kgdialog.cpp index 91058a0b8..684c57e6d 100644 --- a/tdm/kfrontend/kgdialog.cpp +++ b/tdm/kfrontend/kgdialog.cpp @@ -60,42 +60,42 @@ KGDialog::completeMenu() if (_isLocal) { dpyMenu = new TQPopupMenu( this ); int id = inserten( i18n("Sw&itch User"), ALT+Key_I, dpyMenu ); - connect( dpyMenu, TQT_SIGNAL(activated( int )), - TQT_SLOT(slotDisplaySelected( int )) ); - connect( dpyMenu, TQT_SIGNAL(aboutToShow()), - TQT_SLOT(slotPopulateDisplays()) ); + connect( dpyMenu, TQ_SIGNAL(activated( int )), + TQ_SLOT(slotDisplaySelected( int )) ); + connect( dpyMenu, TQ_SIGNAL(aboutToShow()), + TQ_SLOT(slotPopulateDisplays()) ); TQAccel *accel = new TQAccel( this ); accel->insertItem( ALT+CTRL+Key_Insert, id ); - connect( accel, TQT_SIGNAL(activated( int )), TQT_SLOT(slotActivateMenu( int )) ); + connect( accel, TQ_SIGNAL(activated( int )), TQ_SLOT(slotActivateMenu( int )) ); } #endif if (_allowClose) inserten( _isLocal ? i18n("R&estart X Server") : i18n("Clos&e Connection"), - ALT+Key_E, TQT_SLOT(slotExit()) ); + ALT+Key_E, TQ_SLOT(slotExit()) ); #ifdef XDMCP if (_isLocal && _loginMode != _switchIf) { switchCode = _switchCode; - inserten( _switchMsg, _switchAccel, TQT_SLOT(slotSwitch()) ); + inserten( _switchMsg, _switchAccel, TQ_SLOT(slotSwitch()) ); } #endif if (_hasConsole) - inserten( i18n("Co&nsole Login"), ALT+Key_N, TQT_SLOT(slotConsole()) ); + inserten( i18n("Co&nsole Login"), ALT+Key_N, TQ_SLOT(slotConsole()) ); if (_allowShutdown != SHUT_NONE) { ensureMenu(); - optMenu->insertItem(SmallIconSet( "system-log-out" ), i18n("&Shutdown..."), this, TQT_SLOT(slotShutdown(int)), ALT+Key_S ); + optMenu->insertItem(SmallIconSet( "system-log-out" ), i18n("&Shutdown..."), this, TQ_SLOT(slotShutdown(int)), ALT+Key_S ); TQAccel *accel = new TQAccel( this ); accel->insertItem( ALT+CTRL+Key_Delete ); - connect( accel, TQT_SIGNAL(activated( int )), TQT_SLOT(slotShutdown( int )) ); + connect( accel, TQ_SIGNAL(activated( int )), TQ_SLOT(slotShutdown( int )) ); accel = new TQAccel( this ); accel->insertItem( SHIFT+ALT+CTRL+Key_PageUp, SHUT_REBOOT ); - connect( accel, TQT_SIGNAL(activated( int )), TQT_SLOT(slotShutdown( int )) ); + connect( accel, TQ_SIGNAL(activated( int )), TQ_SLOT(slotShutdown( int )) ); accel = new TQAccel( this ); accel->insertItem( SHIFT+ALT+CTRL+Key_PageDown, SHUT_HALT ); - connect( accel, TQT_SIGNAL(activated( int )), TQT_SLOT(slotShutdown( int )) ); + connect( accel, TQ_SIGNAL(activated( int )), TQ_SLOT(slotShutdown( int )) ); } } @@ -125,7 +125,7 @@ KGDialog::inserten( const TQString& txt, int accel, TQPopupMenu *cmnu ) ensureMenu(); int id = optMenu->insertItem( txt, cmnu ); optMenu->setAccel( accel, id ); - optMenu->connectItem( id, this, TQT_SLOT(slotActivateMenu( int )) ); + optMenu->connectItem( id, this, TQ_SLOT(slotActivateMenu( int )) ); optMenu->setItemParameter( id, id ); return id; } @@ -151,7 +151,7 @@ KGDialog::slotSwitch() { #ifdef XDMCP // workaround for Qt bug - TQTimer::singleShot( 0, this, TQT_SLOT(slotReallySwitch()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotReallySwitch()) ); #endif } diff --git a/tdm/kfrontend/kgreeter.cpp b/tdm/kfrontend/kgreeter.cpp index 19d27fe2f..d0815efbe 100644 --- a/tdm/kfrontend/kgreeter.cpp +++ b/tdm/kfrontend/kgreeter.cpp @@ -207,18 +207,18 @@ KGreeter::KGreeter( bool framed ) if (_userList) { readFacesList(); userView = new UserListView( framed, this ); - connect( userView, TQT_SIGNAL(clicked( TQListViewItem * )), - TQT_SLOT(slotUserClicked( TQListViewItem * )) ); - connect( userView, TQT_SIGNAL(doubleClicked( TQListViewItem * )), - TQT_SLOT(accept()) ); + connect( userView, TQ_SIGNAL(clicked( TQListViewItem * )), + TQ_SLOT(slotUserClicked( TQListViewItem * )) ); + connect( userView, TQ_SIGNAL(doubleClicked( TQListViewItem * )), + TQ_SLOT(accept()) ); } if (_userCompletion) { userList = new TQStringList; } sessMenu = new TQPopupMenu( this ); - connect( sessMenu, TQT_SIGNAL(activated( int )), - TQT_SLOT(slotSessionSelected( int )) ); + connect( sessMenu, TQ_SIGNAL(activated( int )), + TQ_SLOT(slotSessionSelected( int )) ); insertSessions(); if (curPlugin < 0) { @@ -230,8 +230,8 @@ KGreeter::KGreeter( bool framed ) mControlPipeHandler = new ControlPipeHandlerObject(); mControlPipeHandler->mKGreeterParent = this; mControlPipeHandler->moveToThread(mControlPipeHandlerThread); - TQObject::connect(mControlPipeHandler, SIGNAL(processCommand(TQString)), this, SLOT(processInputPipeCommand(TQString))); - TQTimer::singleShot(0, mControlPipeHandler, SLOT(run())); + TQObject::connect(mControlPipeHandler, TQ_SIGNAL(processCommand(TQString)), this, TQ_SLOT(processInputPipeCommand(TQString))); + TQTimer::singleShot(0, mControlPipeHandler, TQ_SLOT(run())); mControlPipeHandlerThread->start(); } @@ -258,8 +258,8 @@ void KGreeter::cryptographicCardWatcherSetup() { TDEGenericHardwareList cardReaderList = hwdevices->listByDeviceClass(TDEGenericDeviceType::CryptographicCard); for (hwdevice = cardReaderList.first(); hwdevice; hwdevice = cardReaderList.next()) { TDECryptographicCardDevice* cdevice = static_cast(hwdevice); - connect(cdevice, TQT_SIGNAL(certificateListAvailable(TDECryptographicCardDevice*)), this, TQT_SLOT(cryptographicCardInserted(TDECryptographicCardDevice*))); - connect(cdevice, TQT_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), this, TQT_SLOT(cryptographicCardRemoved(TDECryptographicCardDevice*))); + connect(cdevice, TQ_SIGNAL(certificateListAvailable(TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardInserted(TDECryptographicCardDevice*))); + connect(cdevice, TQ_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardRemoved(TDECryptographicCardDevice*))); cdevice->enableCardMonitoring(true); } #endif @@ -656,7 +656,7 @@ KGreeter::slotUserEntered() if (isVisible()) slotLoadPrevWM(); else - TQTimer::singleShot( 0, this, TQT_SLOT(slotLoadPrevWM()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotLoadPrevWM()) ); } void @@ -1053,7 +1053,7 @@ KStdGreeter::KStdGreeter() goButton = new TQPushButton( i18n("L&ogin"), this ); goButton->setDefault( true ); - connect( goButton, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); + connect( goButton, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); menuButton = new TQPushButton( i18n("&Menu"), this ); //helpButton @@ -1112,7 +1112,7 @@ KStdGreeter::KStdGreeter() verify->setInfoMessageDisplay(showInfoMessages); verify->start(); - TQTimer::singleShot(0, this, SLOT(cryptographicCardWatcherSetup())); + TQTimer::singleShot(0, this, TQ_SLOT(cryptographicCardWatcherSetup())); } void @@ -1168,8 +1168,8 @@ KThemedGreeter::KThemedGreeter() return; } - connect( themer, TQT_SIGNAL(activated( const TQString & )), - TQT_SLOT(slotThemeActivated( const TQString & )) ); + connect( themer, TQ_SIGNAL(activated( const TQString & )), + TQ_SLOT(slotThemeActivated( const TQString & )) ); console_rect = themer->findNode( "xconsole" ); // tdm ext userlist_rect = themer->findNode( "userlist" ); @@ -1256,14 +1256,14 @@ KThemedGreeter::KThemedGreeter() system_button = themer->findNode( "system_button" ); TQAccel *accel = new TQAccel( this ); accel->insertItem( ALT+Key_M, 0 ); - connect( accel, TQT_SIGNAL(activated( int )), TQT_SLOT(slotActionMenu()) ); + connect( accel, TQ_SIGNAL(activated( int )), TQ_SLOT(slotActionMenu()) ); pluginSetup(); verify->setInfoMessageDisplay(showInfoMessages); verify->start(); - TQTimer::singleShot(0, this, SLOT(cryptographicCardWatcherSetup())); + TQTimer::singleShot(0, this, TQ_SLOT(cryptographicCardWatcherSetup())); } bool diff --git a/tdm/kfrontend/kgverify.cpp b/tdm/kfrontend/kgverify.cpp index 66b13e974..105ee3aeb 100644 --- a/tdm/kfrontend/kgverify.cpp +++ b/tdm/kfrontend/kgverify.cpp @@ -105,8 +105,8 @@ KGVerify::KGVerify(KGVerifyHandler *_handler, KdmThemer *_themer, , cardLoginDevice(NULL) #endif { - connect( &timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()) ); - connect( kapp, TQT_SIGNAL(activity()), TQT_SLOT(slotActivity()) ); + connect( &timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()) ); + connect( kapp, TQ_SIGNAL(activity()), TQ_SLOT(slotActivity()) ); _parent->installEventFilter( this ); } @@ -125,8 +125,8 @@ KGVerify::getPlugMenu() uint np = pluginList.count(); if (np > 1) { plugMenu = new TQPopupMenu( parent ); - connect( plugMenu, TQT_SIGNAL(activated( int )), - TQT_SLOT(slotPluginSelected( int )) ); + connect( plugMenu, TQ_SIGNAL(activated( int )), + TQ_SLOT(slotPluginSelected( int )) ); for (uint i = 0; i < np; i++) plugMenu->insertItem( i18n(greetPlugins[pluginList[i]].info->name), pluginList[i] ); } @@ -1264,10 +1264,10 @@ KGChTok::KGChTok( TQWidget *_parent, const TQString &user, hlay->addWidget( cancelButton ); hlay->addStretch( 1 ); - connect( okButton, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); - connect( cancelButton, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); + connect( okButton, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); + connect( cancelButton, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) ); - TQTimer::singleShot( 0, verify, TQT_SLOT(start()) ); + TQTimer::singleShot( 0, verify, TQ_SLOT(start()) ); } KGChTok::~KGChTok() @@ -1321,7 +1321,7 @@ QXTimer::QXTimer() : inherited( 0 ) , left( -1 ) { - connect( &timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()) ); + connect( &timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()) ); } void diff --git a/tdm/kfrontend/krootimage.cpp b/tdm/kfrontend/krootimage.cpp index 889f41e58..a52adabb2 100644 --- a/tdm/kfrontend/krootimage.cpp +++ b/tdm/kfrontend/krootimage.cpp @@ -51,8 +51,8 @@ MyApplication::MyApplication( const char *conf ) : TDEApplication(), renderer( 0, new KSimpleConfig( TQFile::decodeName( conf ) ) ) { - connect( &timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()) ); - connect( &renderer, TQT_SIGNAL(imageDone( int )), this, TQT_SLOT(renderDone()) ); + connect( &timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()) ); + connect( &renderer, TQ_SIGNAL(imageDone( int )), this, TQ_SLOT(renderDone()) ); renderer.enableTiling( true ); // optimize renderer.changeWallpaper(); // cannot do it when we're killed, so do it now timer.start( 60000 ); diff --git a/tdm/kfrontend/sakdlg.cpp b/tdm/kfrontend/sakdlg.cpp index 138045a52..879e30e02 100644 --- a/tdm/kfrontend/sakdlg.cpp +++ b/tdm/kfrontend/sakdlg.cpp @@ -133,7 +133,7 @@ SAKDlg::SAKDlg(TQWidget *parent) mSAKProcess = new TDEProcess; *mSAKProcess << "tdmtsak" << "dm"; - connect(mSAKProcess, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotSAKProcessExited())); + connect(mSAKProcess, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotSAKProcessExited())); mSAKProcess->start(); #ifdef WITH_TDEHWLIB @@ -143,8 +143,8 @@ SAKDlg::SAKDlg(TQWidget *parent) TDEGenericHardwareList cardReaderList = hwdevices->listByDeviceClass(TDEGenericDeviceType::CryptographicCard); for (hwdevice = cardReaderList.first(); hwdevice; hwdevice = cardReaderList.next()) { TDECryptographicCardDevice* cdevice = static_cast(hwdevice); - connect(cdevice, TQT_SIGNAL(certificateListAvailable(TDECryptographicCardDevice*)), this, TQT_SLOT(cryptographicCardInserted(TDECryptographicCardDevice*))); - connect(cdevice, TQT_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), this, TQT_SLOT(cryptographicCardRemoved(TDECryptographicCardDevice*))); + connect(cdevice, TQ_SIGNAL(certificateListAvailable(TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardInserted(TDECryptographicCardDevice*))); + connect(cdevice, TQ_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardRemoved(TDECryptographicCardDevice*))); cdevice->enableCardMonitoring(true); } #endif @@ -153,8 +153,8 @@ SAKDlg::SAKDlg(TQWidget *parent) mControlPipeHandler = new ControlPipeHandlerObject(); mControlPipeHandler->mSAKDlgParent = this; mControlPipeHandler->moveToThread(mControlPipeHandlerThread); - TQObject::connect(mControlPipeHandler, SIGNAL(processCommand(TQString)), this, SLOT(processInputPipeCommand(TQString))); - TQTimer::singleShot(0, mControlPipeHandler, SLOT(run())); + TQObject::connect(mControlPipeHandler, TQ_SIGNAL(processCommand(TQString)), this, TQ_SLOT(processInputPipeCommand(TQString))); + TQTimer::singleShot(0, mControlPipeHandler, TQ_SLOT(run())); mControlPipeHandlerThread->start(); } diff --git a/tdm/kfrontend/tdmadmindialog.cpp b/tdm/kfrontend/tdmadmindialog.cpp index 7c792c083..9f511d221 100644 --- a/tdm/kfrontend/tdmadmindialog.cpp +++ b/tdm/kfrontend/tdmadmindialog.cpp @@ -70,7 +70,7 @@ TDMAdmin::TDMAdmin( const TQString &user, TQWidget *_parent ) box->addLayout( verify->getLayout() ); TQAccel *accel = new TQAccel( this ); accel->insertItem( ALT+Key_A, 0 ); - connect( accel, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivatePlugMenu()) ); + connect( accel, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivatePlugMenu()) ); box->addWidget( new KSeparator( KSeparator::HLine, this ) ); @@ -87,8 +87,8 @@ TDMAdmin::TDMAdmin( const TQString &user, TQWidget *_parent ) hlay->addWidget( cancelButton ); hlay->addStretch( 1 ); - connect( okButton, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); - connect( cancelButton, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); + connect( okButton, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); + connect( cancelButton, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) ); slotWhenChanged(); } diff --git a/tdm/kfrontend/tdmclock.cpp b/tdm/kfrontend/tdmclock.cpp index f9a7122b8..88beae860 100644 --- a/tdm/kfrontend/tdmclock.cpp +++ b/tdm/kfrontend/tdmclock.cpp @@ -37,7 +37,7 @@ KdmClock::KdmClock( TQWidget *parent, const char *name ) { // start timer TQTimer *timer = new TQTimer( this ); - connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(timeout()) ); + connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(timeout()) ); timer->start( 1000 ); // reading rc file diff --git a/tdm/kfrontend/tdmshutdown.cpp b/tdm/kfrontend/tdmshutdown.cpp index 1a9ea254c..da0863be5 100644 --- a/tdm/kfrontend/tdmshutdown.cpp +++ b/tdm/kfrontend/tdmshutdown.cpp @@ -108,7 +108,7 @@ TDMShutdownBase::complete( TQWidget *prevWidget ) box->addLayout( verify->getLayout() ); TQAccel *accel = new TQAccel( this ); accel->insertItem( ALT+Key_A, 0 ); - connect( accel, TQT_SIGNAL(activated( int )), TQT_SLOT(slotActivatePlugMenu()) ); + connect( accel, TQ_SIGNAL(activated( int )), TQ_SLOT(slotActivatePlugMenu()) ); } box->addWidget( new KSeparator( KSeparator::HLine, this ) ); @@ -121,7 +121,7 @@ TDMShutdownBase::complete( TQWidget *prevWidget ) okButton->setDefault( true ); hlay->addWidget( okButton ); hlay->addStretch( 1 ); - connect( okButton, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); + connect( okButton, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); } if (maySched) { KPushButton *schedButton = @@ -129,7 +129,7 @@ TDMShutdownBase::complete( TQWidget *prevWidget ) schedButton->setSizePolicy( fp ); hlay->addWidget( schedButton ); hlay->addStretch( 1 ); - connect( schedButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotSched()) ); + connect( schedButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotSched()) ); } cancelButton = new KPushButton( KStdGuiItem::cancel(), this ); cancelButton->setSizePolicy( fp ); @@ -137,7 +137,7 @@ TDMShutdownBase::complete( TQWidget *prevWidget ) cancelButton->setDefault( true ); hlay->addWidget( cancelButton ); hlay->addStretch( 1 ); - connect( cancelButton, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); + connect( cancelButton, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) ); updateNeedRoot(); } @@ -260,8 +260,8 @@ TDMShutdown::TDMShutdown( int _uid, TQWidget *_parent ) restart_rb = new TDMRadioButton( i18n("&Restart computer"), howGroup ); - connect( rb, TQT_SIGNAL(doubleClicked()), TQT_SLOT(accept()) ); - connect( restart_rb, TQT_SIGNAL(doubleClicked()), TQT_SLOT(accept()) ); + connect( rb, TQ_SIGNAL(doubleClicked()), TQ_SLOT(accept()) ); + connect( restart_rb, TQ_SIGNAL(doubleClicked()), TQ_SLOT(accept()) ); GSet( 1 ); GSendInt( G_ListBootOpts ); @@ -280,7 +280,7 @@ TDMShutdown::TDMShutdown( int _uid, TQWidget *_parent ) + howGroup->insideSpacing(); hb->addSpacing( spc ); hb->addWidget( targets ); - connect( targets, TQT_SIGNAL(activated( int )), TQT_SLOT(slotTargetChanged()) ); + connect( targets, TQ_SIGNAL(activated( int )), TQ_SLOT(slotTargetChanged()) ); } GSet( 0 ); @@ -297,7 +297,7 @@ TDMShutdown::TDMShutdown( int _uid, TQWidget *_parent ) cb_force = new TQCheckBox( i18n("&Force after timeout"), schedGroup ); if (_allowNuke != SHUT_NONE) { - connect( cb_force, TQT_SIGNAL(clicked()), TQT_SLOT(slotWhenChanged()) ); + connect( cb_force, TQ_SIGNAL(clicked()), TQ_SLOT(slotWhenChanged()) ); mayNuke = true; } else cb_force->setEnabled( false ); @@ -437,9 +437,9 @@ TDMDelayedPushButton::TDMDelayedPushButton( const KGuiItem &item, : inherited( item, parent, name ) , pop( 0 ) { - connect( this, TQT_SIGNAL(pressed()), TQT_SLOT(slotPressed()) ); - connect( this, TQT_SIGNAL(released()), TQT_SLOT(slotReleased()) ); - connect( &popt, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()) ); + connect( this, TQ_SIGNAL(pressed()), TQ_SLOT(slotPressed()) ); + connect( this, TQ_SIGNAL(released()), TQ_SLOT(slotReleased()) ); + connect( &popt, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()) ); } void TDMDelayedPushButton::setPopup( TQPopupMenu *p ) @@ -503,7 +503,7 @@ TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent ) int i = btnReboot->textLabel().find( TQRegExp("\\&"), 0 ); // i == 1 btnReboot->setAccel( "ALT+" + btnReboot->textLabel().lower()[i+1] ) ; hbuttonbox->addWidget ( btnReboot); - connect(btnReboot, TQT_SIGNAL(clicked()), TQT_SLOT(slotReboot())); + connect(btnReboot, TQ_SIGNAL(clicked()), TQ_SLOT(slotReboot())); // Copied completely from the standard restart/shutdown dialog GSet( 1 ); @@ -522,7 +522,7 @@ TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent ) t, i ); } btnReboot->setPopup( targets ); - connect( targets, TQT_SIGNAL(activated(int)), TQT_SLOT(slotReboot(int)) ); + connect( targets, TQ_SIGNAL(activated(int)), TQ_SLOT(slotReboot(int)) ); } GSet( 0 ); // Copied completely from the standard restart/shutdown dialog @@ -534,7 +534,7 @@ TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent ) i = btnHalt->textLabel().find( TQRegExp("\\&"), 0 ); // i == 1 btnHalt->setAccel( "ALT+" + btnHalt->textLabel().lower()[i+1] ) ; hbuttonbox->addWidget ( btnHalt ); - connect(btnHalt, TQT_SIGNAL(clicked()), TQT_SLOT(slotHalt())); + connect(btnHalt, TQ_SIGNAL(clicked()), TQ_SLOT(slotHalt())); // cancel buttonbox TQHBoxLayout* hbuttonbox2 = new TQHBoxLayout( vbox, 8 * KDialog::spacingHint() ); @@ -543,7 +543,7 @@ TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent ) // Back to tdm KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), lfrm ); hbuttonbox2->addWidget( btnBack ); - connect(btnBack, TQT_SIGNAL(clicked()), TQT_SLOT(reject())); + connect(btnBack, TQ_SIGNAL(clicked()), TQ_SLOT(reject())); } else { @@ -567,14 +567,14 @@ TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent ) KPushButton *btnHalt = new KPushButton( KGuiItem( i18n("&Turn Off Computer"), "system-log-out" ), this ); buttonlay->addWidget( btnHalt ); - connect( btnHalt, TQT_SIGNAL(clicked()), TQT_SLOT(slotHalt()) ); + connect( btnHalt, TQ_SIGNAL(clicked()), TQ_SLOT(slotHalt()) ); buttonlay->addSpacing( KDialog::spacingHint() ); TDMDelayedPushButton *btnReboot = new TDMDelayedPushButton( KGuiItem( i18n("&Restart Computer"), "reload" ), this ); buttonlay->addWidget( btnReboot ); - connect( btnReboot, TQT_SIGNAL(clicked()), TQT_SLOT(slotReboot()) ); + connect( btnReboot, TQ_SIGNAL(clicked()), TQ_SLOT(slotReboot()) ); GSet( 1 ); GSendInt( G_ListBootOpts ); @@ -591,7 +591,7 @@ TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent ) t, i ); } btnReboot->setPopup( targets ); - connect( targets, TQT_SIGNAL(activated(int)), TQT_SLOT(slotReboot(int)) ); + connect( targets, TQ_SIGNAL(activated(int)), TQ_SLOT(slotReboot(int)) ); } GSet( 0 ); @@ -601,7 +601,7 @@ TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent ) KPushButton *btnSched = new KPushButton( KGuiItem( i18n("&Schedule...") ), this ); buttonlay->addWidget( btnSched ); - connect( btnSched, TQT_SIGNAL(clicked()), TQT_SLOT(slotSched()) ); + connect( btnSched, TQ_SIGNAL(clicked()), TQ_SLOT(slotSched()) ); buttonlay->addStretch( 1 ); } @@ -612,7 +612,7 @@ TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent ) KPushButton *btnBack = new KPushButton( KStdGuiItem::cancel(), this ); buttonlay->addWidget( btnBack ); - connect( btnBack, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); + connect( btnBack, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) ); buttonlay->addSpacing( KDialog::spacingHint() ); } diff --git a/tdm/kfrontend/themer/tdmitem.cpp b/tdm/kfrontend/themer/tdmitem.cpp index e89890129..befcb7c35 100644 --- a/tdm/kfrontend/themer/tdmitem.cpp +++ b/tdm/kfrontend/themer/tdmitem.cpp @@ -238,7 +238,7 @@ KdmItem::setWidget( TQWidget *widget ) setGeometry(area, true); - connect( myWidget, TQT_SIGNAL(destroyed()), TQT_SLOT(widgetGone()) ); + connect( myWidget, TQ_SIGNAL(destroyed()), TQ_SLOT(widgetGone()) ); } void @@ -253,11 +253,11 @@ KdmItem::setLayoutItem( TQLayoutItem *item ) myLayoutItem = item; // XXX hiding not supported - it think it's pointless here if (myLayoutItem->widget()) - connect( myLayoutItem->widget(), TQT_SIGNAL(destroyed()), - TQT_SLOT(layoutItemGone()) ); + connect( myLayoutItem->widget(), TQ_SIGNAL(destroyed()), + TQ_SLOT(layoutItemGone()) ); else if (myLayoutItem->layout()) - connect( myLayoutItem->layout(), TQT_SIGNAL(destroyed()), - TQT_SLOT(layoutItemGone()) ); + connect( myLayoutItem->layout(), TQ_SIGNAL(destroyed()), + TQ_SLOT(layoutItemGone()) ); } void @@ -583,8 +583,8 @@ KdmItem::addChildItem( KdmItem *item ) } // signal bounce from child to parent - connect( item, TQT_SIGNAL(needUpdate( int, int, int, int )), TQT_SIGNAL(needUpdate( int, int, int, int )) ); - connect( item, TQT_SIGNAL(activated( const TQString & )), TQT_SIGNAL(activated( const TQString & )) ); + connect( item, TQ_SIGNAL(needUpdate( int, int, int, int )), TQ_SIGNAL(needUpdate( int, int, int, int )) ); + connect( item, TQ_SIGNAL(activated( const TQString & )), TQ_SIGNAL(activated( const TQString & )) ); } void diff --git a/tdm/kfrontend/themer/tdmlabel.cpp b/tdm/kfrontend/themer/tdmlabel.cpp index f2fae90a6..1af382819 100644 --- a/tdm/kfrontend/themer/tdmlabel.cpp +++ b/tdm/kfrontend/themer/tdmlabel.cpp @@ -100,7 +100,7 @@ KdmLabel::KdmLabel( KdmItem *parent, const TQDomNode &node, const char *name ) if (label.isTimer) { timer = new TQTimer( this ); timer->start( 1000 ); - connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(update()) ); + connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(update()) ); } setTextInt( lookupText( label.text ) ); } @@ -117,7 +117,7 @@ KdmLabel::setTextInt( const TQString &txt) cText.remove('&'); myAccel = new TQAccel(parentWidget()); myAccel->insertItem(ALT + UNICODE_ACCEL + cText.at(cAccel).lower().unicode()); - connect(myAccel, TQT_SIGNAL(activated(int)), TQT_SLOT(slotAccel())); + connect(myAccel, TQ_SIGNAL(activated(int)), TQ_SLOT(slotAccel())); } } diff --git a/tdm/kfrontend/themer/tdmthemer.cpp b/tdm/kfrontend/themer/tdmthemer.cpp index 16fdf7c89..f064e384a 100644 --- a/tdm/kfrontend/themer/tdmthemer.cpp +++ b/tdm/kfrontend/themer/tdmthemer.cpp @@ -78,24 +78,24 @@ KdmThemer::KdmThemer( const TQString &_filename, const TQString &mode, TQWidget // Set the root (screen) item rootItem = new KdmRect( parent, TQDomNode(), "tdm root" ); - connect( rootItem, TQT_SIGNAL(needUpdate( int, int, int, int )), - widget(), TQT_SLOT(update( int, int, int, int )) ); + connect( rootItem, TQ_SIGNAL(needUpdate( int, int, int, int )), + widget(), TQ_SLOT(update( int, int, int, int )) ); rootItem->setBaseDir( TQFileInfo( filename ).dirPath( true ) ); // generate all the items defined in the theme generateItems( rootItem ); - connect( rootItem, TQT_SIGNAL(activated( const TQString & )), TQT_SIGNAL(activated( const TQString & )) ); - connect( rootItem, TQT_SIGNAL(activated( const TQString & )), TQT_SLOT(slotActivated( const TQString & )) ); + connect( rootItem, TQ_SIGNAL(activated( const TQString & )), TQ_SIGNAL(activated( const TQString & )) ); + connect( rootItem, TQ_SIGNAL(activated( const TQString & )), TQ_SLOT(slotActivated( const TQString & )) ); - TQTimer::singleShot(800, this, TQT_SLOT(slotPaintRoot())); + TQTimer::singleShot(800, this, TQ_SLOT(slotPaintRoot())); /* *TODO* // Animation timer TQTimer *time = new TQTimer( this ); time->start( 500 ); - connect( time, TQT_SIGNAL(timeout()), TQT_SLOT(update()) ) + connect( time, TQ_SIGNAL(timeout()), TQ_SLOT(update()) ) */ } -- cgit v1.2.1