From 475e688ff8ac7e7d19aae37ab29224683eeee4de Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Tue, 12 Sep 2023 00:46:07 +0300 Subject: [PATCH] kioslave: effectively revert 119bf184dea0a0c5ce3775fee26cb7c5b9979d0a see the following commit in kdelibs: c4ae9e046090e31201dfb1c7cfd2dc406aaf45c0 Signed-off-by: Ivailo Monev --- kioslave/trash/trashsizecache.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/kioslave/trash/trashsizecache.cpp b/kioslave/trash/trashsizecache.cpp index da3ceb1c..9d0bf926 100644 --- a/kioslave/trash/trashsizecache.cpp +++ b/kioslave/trash/trashsizecache.cpp @@ -31,10 +31,7 @@ #include -static QString kTrashLock() -{ - return KGlobal::dirs()->saveLocation("tmp") + QLatin1String( "trash" ); -} +static QString s_trahslockname = QString::fromLatin1( "trash" ); TrashSizeCache::TrashSizeCache( const QString &path ) : mTrashSizeCachePath( path + QDir::separator() + QString::fromLatin1( "metadata" ) ), @@ -52,7 +49,7 @@ void TrashSizeCache::initialize() void TrashSizeCache::add( qulonglong value ) { - KLockFile lock( kTrashLock() ); + KLockFile lock( s_trahslockname ); lock.lock(); KConfig config( mTrashSizeCachePath ); @@ -67,7 +64,7 @@ void TrashSizeCache::add( qulonglong value ) void TrashSizeCache::remove( qulonglong value ) { - KLockFile lock( kTrashLock() ); + KLockFile lock( s_trahslockname ); lock.lock(); KConfig config( mTrashSizeCachePath ); @@ -82,7 +79,7 @@ void TrashSizeCache::remove( qulonglong value ) void TrashSizeCache::clear() { - KLockFile lock( kTrashLock() ); + KLockFile lock( s_trahslockname ); lock.lock(); KConfig config( mTrashSizeCachePath ); @@ -99,7 +96,7 @@ qulonglong TrashSizeCache::size() const qulonglong TrashSizeCache::currentSize( bool doLocking ) const { - KLockFile lock( kTrashLock() ); + KLockFile lock( s_trahslockname ); if ( doLocking ) { lock.lock();