diff options
Diffstat (limited to 'tdeutils')
| -rw-r--r-- | tdeutils/kcmultidialog.cpp | 2 | ||||
| -rw-r--r-- | tdeutils/tdecmoduleproxy.cpp | 8 | ||||
| -rw-r--r-- | tdeutils/tdecmoduleproxyIfaceImpl.cpp | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/tdeutils/kcmultidialog.cpp b/tdeutils/kcmultidialog.cpp index 74ba93f14..3cc3c70ae 100644 --- a/tdeutils/kcmultidialog.cpp +++ b/tdeutils/kcmultidialog.cpp @@ -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 )) diff --git a/tdeutils/tdecmoduleproxy.cpp b/tdeutils/tdecmoduleproxy.cpp index 65f5d024c..85724a0a3 100644 --- a/tdeutils/tdecmoduleproxy.cpp +++ b/tdeutils/tdecmoduleproxy.cpp @@ -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 diff --git a/tdeutils/tdecmoduleproxyIfaceImpl.cpp b/tdeutils/tdecmoduleproxyIfaceImpl.cpp index 6e6f1b286..77291bd3e 100644 --- a/tdeutils/tdecmoduleproxyIfaceImpl.cpp +++ b/tdeutils/tdecmoduleproxyIfaceImpl.cpp @@ -61,7 +61,7 @@ void TDECModuleProxyIfaceImpl::defaults() TQString TDECModuleProxyIfaceImpl::applicationName() { - return kapp->caption(); + return tdeApp->caption(); } TQString TDECModuleProxyIfaceImpl::quickHelp() @@ -106,10 +106,10 @@ TDECModuleProxyRootCommunicatorImpl::TDECModuleProxyRootCommunicatorImpl */ /* Note, we don't use TDECModuleProxy::d->dcopClient */ - kapp->dcopClient()->connectDCOPSignal( 0, p->dcopName(), + tdeApp->dcopClient()->connectDCOPSignal( 0, p->dcopName(), "changed(bool)", objId(), "changed(bool)", false ); - kapp->dcopClient()->connectDCOPSignal( 0, p->dcopName(), + tdeApp->dcopClient()->connectDCOPSignal( 0, p->dcopName(), "quickHelpChanged()", objId(), "quickHelpChanged()", false ); } |