diff options
Diffstat (limited to 'tdeutils/tdecmoduleproxy.cpp')
| -rw-r--r-- | tdeutils/tdecmoduleproxy.cpp | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/tdeutils/tdecmoduleproxy.cpp b/tdeutils/tdecmoduleproxy.cpp index d074b8c02..17ebd94b2 100644 --- a/tdeutils/tdecmoduleproxy.cpp +++ b/tdeutils/tdecmoduleproxy.cpp @@ -43,9 +43,9 @@ #include <kdebug.h> #include <kdialog.h> #include <tdelocale.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kservice.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kuser.h> #include <X11/Xlib.h> @@ -155,7 +155,7 @@ TDECModule * TDECModuleProxy::realModule() const if( d->rootMode ) return 0; - TQApplication::setOverrideCursor( Qt::WaitCursor ); + TQApplication::setOverrideCursor( TQt::WaitCursor ); TDECModuleProxy * that = const_cast<TDECModuleProxy*>( this ); @@ -185,12 +185,12 @@ TDECModule * TDECModuleProxy::realModule() const d->kcm = TDECModuleLoader::loadModule( moduleInfo(), TDECModuleLoader::Inline, d->withFallback, that, name(), d->args ); - connect( d->kcm, TQT_SIGNAL( changed( bool ) ), - TQT_SLOT(moduleChanged(bool)) ); - connect( d->kcm, TQT_SIGNAL( destroyed() ), - TQT_SLOT( moduleDestroyed() ) ); - connect( d->kcm, TQT_SIGNAL(quickHelpChanged()), - TQT_SIGNAL(quickHelpChanged())); + connect( d->kcm, TQ_SIGNAL( changed( bool ) ), + TQ_SLOT(moduleChanged(bool)) ); + connect( d->kcm, TQ_SIGNAL( destroyed() ), + TQ_SLOT( moduleDestroyed() ) ); + connect( d->kcm, TQ_SIGNAL(quickHelpChanged()), + TQ_SIGNAL(quickHelpChanged())); TQWhatsThis::add( that, d->kcm->quickHelp() ); d->topLayout->addWidget( d->kcm ); @@ -234,8 +234,8 @@ TDECModule * TDECModuleProxy::realModule() const d->dcopClient->attach(); d->dcopClient->setNotifications( true ); - connect( d->dcopClient, TQT_SIGNAL( applicationRemoved( const TQCString& )), - TQT_SLOT( applicationRemoved( const TQCString& ))); + connect( d->dcopClient, TQ_SIGNAL( applicationRemoved( const TQCString& )), + TQ_SLOT( applicationRemoved( const TQCString& ))); /* Figure out the name of where the module is already loaded */ TQByteArray replyData, data; @@ -301,7 +301,7 @@ void TDECModuleProxy::runAsRoot() if ( !moduleInfo().needsRootPrivileges() ) return; - TQApplication::setOverrideCursor( Qt::WaitCursor ); + TQApplication::setOverrideCursor( TQt::WaitCursor ); delete d->rootProcess; delete d->embedWidget; @@ -367,7 +367,7 @@ void TDECModuleProxy::runAsRoot() *d->rootProcess << TQString("%1 %2 --embed-proxy %3 --lang %4").arg(locate("exe", "tdecmshell")) .arg(cmd).arg(d->embedWidget->winId()).arg(TDEGlobal::locale()->language()); - connect(d->rootProcess, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(rootExited())); + connect(d->rootProcess, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(rootExited())); if ( !d->rootProcess->start( TDEProcess::NotifyOnExit )) { @@ -377,7 +377,7 @@ void TDECModuleProxy::runAsRoot() else { d->rootMode = true; - kapp->dcopClient(); + tdeApp->dcopClient(); d->rootCommunicator = new TDECModuleProxyRootCommunicatorImpl( d->dcopName + "-RootCommunicator", this ); } @@ -452,7 +452,7 @@ void TDECModuleProxy::deleteClient() delete d->dcopClient; d->dcopClient = 0; - kapp->syncX(); + tdeApp->syncX(); } @@ -543,7 +543,7 @@ void TDECModuleProxy::callRootModule( const TQCString& function ) /* Note, we don't use d->dcopClient here, because it's used for * the loaded module(and it's not "us" when this function is called) */ - if( !kapp->dcopClient()->call( d->dcopName, d->dcopName, function, sendData, + if( !tdeApp->dcopClient()->call( d->dcopName, d->dcopName, function, sendData, replyType, replyData, true, -1 )) kdDebug(711) << "Calling function '" << function << "' failed." << endl; @@ -567,7 +567,7 @@ TQString TDECModuleProxy::quickHelp() const TQByteArray data, replyData; TQCString replyType; - if (kapp->dcopClient()->call(d->dcopName, d->dcopName, "quickHelp()", + if (tdeApp->dcopClient()->call(d->dcopName, d->dcopName, "quickHelp()", data, replyType, replyData)) kdDebug(711) << "Calling DCOP function bool changed() failed." << endl; else @@ -670,5 +670,3 @@ void TDECModuleProxy::emitQuickHelpChanged() /***************************************************************/ #include "tdecmoduleproxy.moc" - -// vim: sw=4 ts=4 noet |