diff options
author | Uwe Klotz <uklotz@mixxx.org> | 2020-06-06 09:31:03 +0200 |
---|---|---|
committer | Uwe Klotz <uklotz@mixxx.org> | 2020-06-06 13:20:02 +0200 |
commit | f23fa695df4aaf6679ad9222d2e04834325d9d77 (patch) | |
tree | 4476e260c6b18d07cd47661b0ecb7ebef648e20c /src/track | |
parent | 1def3a31a626245253b4a98c72e27cd58e05a31d (diff) |
Rename method to indicate event loop affinity
Diffstat (limited to 'src/track')
-rw-r--r-- | src/track/globaltrackcache.cpp | 13 | ||||
-rw-r--r-- | src/track/globaltrackcache.h | 8 |
2 files changed, 11 insertions, 10 deletions
diff --git a/src/track/globaltrackcache.cpp b/src/track/globaltrackcache.cpp index 8cff786eb0..95474bd2d5 100644 --- a/src/track/globaltrackcache.cpp +++ b/src/track/globaltrackcache.cpp @@ -260,20 +260,21 @@ void GlobalTrackCache::evictAndSaveCachedTrack(GlobalTrackCacheEntryPointer cach QMetaObject::invokeMethod( s_pInstance, #if QT_VERSION < QT_VERSION_CHECK(5, 10, 0) - "evictAndSave" + "slotEvictAndSave", #else [cacheEntryPtr = std::move(cacheEntryPtr)] { s_pInstance->slotEvictAndSave(cacheEntryPtr); - } + }, #endif // Qt will choose either a direct or a queued connection // depending on the thread from which this method has // been invoked! - , Qt::AutoConnection + Qt::AutoConnection #if QT_VERSION < QT_VERSION_CHECK(5, 10, 0) - , Q_ARG(GlobalTrackCacheEntryPointer, std::move(cacheEntryPtr)) + , + Q_ARG(GlobalTrackCacheEntryPointer, std::move(cacheEntryPtr)) #endif - ); + ); } else { // After the singular instance has been destroyed we are // not able to save pending changes. The track is deleted @@ -669,7 +670,7 @@ void GlobalTrackCache::purgeTrackId(TrackId trackId) { } } -void GlobalTrackCache::evictAndSave( +void GlobalTrackCache::slotEvictAndSave( GlobalTrackCacheEntryPointer cacheEntryPtr) { DEBUG_ASSERT_QOBJECT_THREAD_AFFINITY(this); DEBUG_ASSERT(cacheEntryPtr); diff --git a/src/track/globaltrackcache.h b/src/track/globaltrackcache.h index e7fb049ad4..10cf7d2415 100644 --- a/src/track/globaltrackcache.h +++ b/src/track/globaltrackcache.h @@ -186,7 +186,7 @@ protected: class GlobalTrackCache : public QObject { Q_OBJECT -public: + public: static void createInstance( GlobalTrackCacheSaver* pSaver, // A custom deleter is only needed for tests without an event loop! @@ -202,10 +202,10 @@ public: // Deleter callbacks for the smart-pointer static void evictAndSaveCachedTrack(GlobalTrackCacheEntryPointer cacheEntryPtr); -private slots: - void evictAndSave(GlobalTrackCacheEntryPointer cacheEntryPtr); + private slots: + void slotEvictAndSave(GlobalTrackCacheEntryPointer cacheEntryPtr); -private: + private: friend class GlobalTrackCacheLocker; friend class GlobalTrackCacheResolver; |