diff options
Diffstat (limited to 'tdeutils/kcmultidialog.cpp')
| -rw-r--r-- | tdeutils/kcmultidialog.cpp | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/tdeutils/kcmultidialog.cpp b/tdeutils/kcmultidialog.cpp index cbdffaa7d..3cc3c70ae 100644 --- a/tdeutils/kcmultidialog.cpp +++ b/tdeutils/kcmultidialog.cpp @@ -33,7 +33,7 @@ #include <klibloader.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <krun.h> #include <kstdguiitem.h> #include <kuser.h> @@ -89,11 +89,11 @@ KCMultiDialog::KCMultiDialog( int dialogFace, const KGuiItem &user2, inline void KCMultiDialog::init() { - connect( this, TQT_SIGNAL( finished()), TQT_SLOT( dialogClosed())); + connect( this, TQ_SIGNAL( finished()), TQ_SLOT( dialogClosed())); showButton( User1, false ); showButton( User2, false ); enableButton(Apply, false); - connect(this, TQT_SIGNAL(aboutToShowPage(TQWidget *)), this, TQT_SLOT(slotAboutToShow(TQWidget *))); + connect(this, TQ_SIGNAL(aboutToShowPage(TQWidget *)), this, TQ_SLOT(slotAboutToShow(TQWidget *))); setInitialSize(TQSize(640,480)); moduleParentComponents.setAutoDelete( true ); @@ -250,7 +250,7 @@ void KCMultiDialog::addModule(const TDECModuleInfo& moduleinfo, if( !moduleinfo.service() ) return; - if ( !kapp->authorizeControlModule( moduleinfo.service()->menuId() )) + if ( !tdeApp->authorizeControlModule( moduleinfo.service()->menuId() )) return; if( !TDECModuleLoader::testModule( moduleinfo )) @@ -310,7 +310,7 @@ void KCMultiDialog::addModule(const TDECModuleInfo& moduleinfo, moduleParentComponents.insert( module, new TQStringList( parentComponents ) ); - connect(module, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(clientChanged(bool))); + connect(module, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(clientChanged(bool))); if( m_modules.count() == 0 ) aboutToShowPage( page ); @@ -338,7 +338,7 @@ void KCMultiDialog::removeAllModules() { kdDebug( 710 ) << "remove 2" << endl; TDECModuleProxy * kcm = ( *it ).kcm; - TQObject * page = TQT_TQOBJECT(kcm->parent()); + TQObject * page = kcm->parent(); kcm->hide(); if( page ) { @@ -368,7 +368,7 @@ void KCMultiDialog::slotAboutToShow(TQWidget *page) if( ! obj ) return; - TDECModuleProxy * module = ::tqqt_cast<TDECModuleProxy*>(obj); + TDECModuleProxy * module = ::tqt_cast<TDECModuleProxy*>(obj); if( ! module ) return; d->currentModule = module; @@ -378,15 +378,15 @@ void KCMultiDialog::slotAboutToShow(TQWidget *page) enableButton( KDialogBase::Default, d->currentModule->buttons() & TDECModule::Default ); - disconnect( this, TQT_SIGNAL(user2Clicked()), 0, 0 ); + disconnect( this, TQ_SIGNAL(user2Clicked()), 0, 0 ); if (d->currentModule->moduleInfo().needsRootPrivileges()) { if ( !d->currentModule->rootMode() ) { /* Enable the Admin Mode button */ enableButton( User2, true ); - connect( this, TQT_SIGNAL(user2Clicked()), d->currentModule, TQT_SLOT( runAsRoot() )); - connect( this, TQT_SIGNAL(user2Clicked()), TQT_SLOT( disableRModeButton() )); + connect( this, TQ_SIGNAL(user2Clicked()), d->currentModule, TQ_SLOT( runAsRoot() )); + connect( this, TQ_SIGNAL(user2Clicked()), TQ_SLOT( disableRModeButton() )); } else enableButton( User2, false); @@ -401,7 +401,7 @@ void KCMultiDialog::rootExit() void KCMultiDialog::disableRModeButton() { enableButton( User2, false ); - connect ( d->currentModule, TQT_SIGNAL( childClosed() ), TQT_SLOT( rootExit() )); + connect ( d->currentModule, TQ_SIGNAL( childClosed() ), TQ_SLOT( rootExit() )); } void KCMultiDialog::dialogClosed() @@ -415,6 +415,3 @@ void KCMultiDialog::dialogClosed() for( ModuleList::Iterator it = m_modules.begin(); it != end; ++it ) ( *it ).kcm->deleteClient(); } - - -// vim: sw=4 et sts=4 |