diff options
| author | Michele Calgaro <[email protected]> | 2025-01-14 15:08:54 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2025-02-03 21:34:30 +0900 |
| commit | 834496cf73084adeb3959b6e2c11f104955bb69a (patch) | |
| tree | 4e9221c9c4bcaa2c2681f3e255b0c771379c379c /tdeioslave | |
| parent | 1a5b54f42c0218aef7def4bc2d5cbcc0ed6cfadd (diff) | |
| download | tdebase-834496cf73084adeb3959b6e2c11f104955bb69a.tar.gz tdebase-834496cf73084adeb3959b6e2c11f104955bb69a.zip | |
Use tdeApp
Signed-off-by: Michele Calgaro <[email protected]>
Diffstat (limited to 'tdeioslave')
| -rw-r--r-- | tdeioslave/media/mediaimpl.cpp | 4 | ||||
| -rw-r--r-- | tdeioslave/media/mediamanager/tdehardwarebackend.cpp | 6 | ||||
| -rw-r--r-- | tdeioslave/media/medianotifier/medianotifier.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/tdeioslave/media/mediaimpl.cpp b/tdeioslave/media/mediaimpl.cpp index 510437072..efa26e884 100644 --- a/tdeioslave/media/mediaimpl.cpp +++ b/tdeioslave/media/mediaimpl.cpp @@ -247,7 +247,7 @@ bool MediaImpl::ensureMediumMounted(Medium &medium) connect( job, TQ_SIGNAL( warning( TDEIO::Job *, const TQString & ) ), this, TQ_SLOT( slotWarning( TDEIO::Job *, const TQString & ) ) ); */ - kapp->dcopClient() + tdeApp->dcopClient() ->connectDCOPSignal("kded", "mediamanager", "mediumChanged(TQString, bool)", "mediaimpl", @@ -272,7 +272,7 @@ bool MediaImpl::ensureMediumMounted(Medium &medium) mp_mounting = 0L; - kapp->dcopClient() + tdeApp->dcopClient() ->disconnectDCOPSignal("kded", "mediamanager", "mediumChanged(TQString, bool)", "mediaimpl", diff --git a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp index b84242b58..46670cd24 100644 --- a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp +++ b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp @@ -1239,7 +1239,7 @@ TQStringVariantMap TDEBackend::mount(const Medium *medium) // The caller expects the device to be mounted when the function // completes. Thus block until the job completes. while (!data.completed) { - kapp->eventLoop()->enterLoop(); + tdeApp->eventLoop()->enterLoop(); } if (!data.error) { result["result"] = true; @@ -1350,7 +1350,7 @@ TQStringVariantMap TDEBackend::unmount(const TQString &id) // The caller expects the device to be unmounted when the function // completes. Thus block until the job completes. while (!data.completed) { - kapp->eventLoop()->enterLoop(); + tdeApp->eventLoop()->enterLoop(); } if (!data.error) { result["result"] = true; @@ -1682,7 +1682,7 @@ void TDEBackend::slotResult(TDEIO::Job *job) /* Job completed. Notify the caller */ data->error = job->error(); data->completed = true; - kapp->eventLoop()->exitLoop(); + tdeApp->eventLoop()->exitLoop(); } TQString TDEBackend::isInFstab(const Medium *medium) diff --git a/tdeioslave/media/medianotifier/medianotifier.cpp b/tdeioslave/media/medianotifier/medianotifier.cpp index c7e33fdb1..b3eec63d6 100644 --- a/tdeioslave/media/medianotifier/medianotifier.cpp +++ b/tdeioslave/media/medianotifier/medianotifier.cpp @@ -114,7 +114,7 @@ void MediaNotifier::onMediumChange( const TQString &name, bool allowNotification // in the background due to focus stealing prevention. Entering a new media can // be seen as a kind of user activity after all. It'd be better to update the timestamp // as soon as the media is entered, but it apparently takes some time to get here. - kapp->updateUserTimestamp(); + tdeApp->updateUserTimestamp(); KURL url( "system:/media/"+name ); |