diff --git a/src/collection/collectionbackend.cpp b/src/collection/collectionbackend.cpp index 45ed9e8fd..4c783c514 100644 --- a/src/collection/collectionbackend.cpp +++ b/src/collection/collectionbackend.cpp @@ -78,7 +78,7 @@ CollectionBackend::~CollectionBackend() { void CollectionBackend::Init(SharedPtr db, SharedPtr task_manager, const Song::Source source, const QString &songs_table, const QString &dirs_table, const QString &subdirs_table) { - setObjectName(source == Song::Source::Collection ? QLatin1String(metaObject()->className()) : QStringLiteral("%1%2").arg(Song::DescriptionForSource(source), QLatin1String(metaObject()->className()))); + setObjectName(source == Song::Source::Collection ? QLatin1String(QObject::metaObject()->className()) : QStringLiteral("%1%2").arg(Song::DescriptionForSource(source), QLatin1String(QObject::metaObject()->className()))); db_ = db; task_manager_ = task_manager; diff --git a/src/collection/collectionlibrary.cpp b/src/collection/collectionlibrary.cpp index 7595b82eb..095d8bdf5 100644 --- a/src/collection/collectionlibrary.cpp +++ b/src/collection/collectionlibrary.cpp @@ -66,7 +66,7 @@ CollectionLibrary::CollectionLibrary(const SharedPtr database, save_playcounts_to_files_(false), save_ratings_to_files_(false) { - setObjectName(QLatin1String(metaObject()->className())); + setObjectName(QLatin1String(QObject::metaObject()->className())); original_thread_ = thread(); diff --git a/src/collection/collectionmodel.cpp b/src/collection/collectionmodel.cpp index bfdb824cc..9278de632 100644 --- a/src/collection/collectionmodel.cpp +++ b/src/collection/collectionmodel.cpp @@ -98,7 +98,7 @@ CollectionModel::CollectionModel(const SharedPtr backend, con loading_(false), icon_disk_cache_(new QNetworkDiskCache(this)) { - setObjectName(backend_->source() == Song::Source::Collection ? QLatin1String(metaObject()->className()) : QStringLiteral("%1%2").arg(Song::DescriptionForSource(backend_->source()), QLatin1String(metaObject()->className()))); + setObjectName(backend_->source() == Song::Source::Collection ? QLatin1String(QObject::metaObject()->className()) : QStringLiteral("%1%2").arg(Song::DescriptionForSource(backend_->source()), QLatin1String(QObject::metaObject()->className()))); filter_->setSourceModel(this); filter_->setSortRole(Role_SortText); diff --git a/src/collection/collectionview.cpp b/src/collection/collectionview.cpp index 0ec170ad6..d699d6e18 100644 --- a/src/collection/collectionview.cpp +++ b/src/collection/collectionview.cpp @@ -108,7 +108,7 @@ CollectionView::CollectionView(QWidget *parent) is_in_keyboard_search_(false), delete_files_(false) { - setObjectName(QLatin1String(metaObject()->className())); + setObjectName(QLatin1String(QObject::metaObject()->className())); setItemDelegate(new CollectionItemDelegate(this)); setAttribute(Qt::WA_MacShowFocusRect, false); diff --git a/src/collection/collectionwatcher.cpp b/src/collection/collectionwatcher.cpp index 037c36ef0..f55d48bb2 100644 --- a/src/collection/collectionwatcher.cpp +++ b/src/collection/collectionwatcher.cpp @@ -106,7 +106,7 @@ CollectionWatcher::CollectionWatcher(const Song::Source source, cue_parser_(new CueParser(tagreader_client, backend, this)), last_scan_time_(0) { - setObjectName(source_ == Song::Source::Collection ? QLatin1String(metaObject()->className()) : QStringLiteral("%1%2").arg(Song::DescriptionForSource(source_), QLatin1String(metaObject()->className()))); + setObjectName(source_ == Song::Source::Collection ? QLatin1String(QObject::metaObject()->className()) : QStringLiteral("%1%2").arg(Song::DescriptionForSource(source_), QLatin1String(QObject::metaObject()->className()))); original_thread_ = thread(); diff --git a/src/core/application.cpp b/src/core/application.cpp index a0325d5a9..e3c2afd6e 100644 --- a/src/core/application.cpp +++ b/src/core/application.cpp @@ -250,7 +250,7 @@ Application::Application(QObject *parent) p_(new ApplicationImpl(this)), g_thread_(nullptr) { - setObjectName(QLatin1String(metaObject()->className())); + setObjectName(QLatin1String(QObject::metaObject()->className())); const QMetaObject *mo = QAbstractEventDispatcher::instance(QCoreApplication::instance()->thread())->metaObject(); if (mo && strcmp(mo->className(), "QEventDispatcherGlib") != 0 && strcmp(mo->superClass()->className(), "QEventDispatcherGlib") != 0) { diff --git a/src/core/database.cpp b/src/core/database.cpp index fde6e8002..75a206483 100644 --- a/src/core/database.cpp +++ b/src/core/database.cpp @@ -69,7 +69,7 @@ Database::Database(SharedPtr task_manager, QObject *parent, const Q startup_schema_version_(-1), original_thread_(nullptr) { - setObjectName(QLatin1String(metaObject()->className())); + setObjectName(QLatin1String(QObject::metaObject()->className())); original_thread_ = thread(); diff --git a/src/core/player.cpp b/src/core/player.cpp index 05957e223..d01721e5c 100644 --- a/src/core/player.cpp +++ b/src/core/player.cpp @@ -99,7 +99,7 @@ Player::Player(const SharedPtr task_manager, const SharedPtrclassName())); + setObjectName(QLatin1String(QObject::metaObject()->className())); timer_save_volume_->setSingleShot(true); timer_save_volume_->setInterval(5s); diff --git a/src/core/taskmanager.cpp b/src/core/taskmanager.cpp index cc7bb65b6..a98ff2335 100644 --- a/src/core/taskmanager.cpp +++ b/src/core/taskmanager.cpp @@ -34,7 +34,7 @@ using namespace Qt::Literals::StringLiterals; TaskManager::TaskManager(QObject *parent) : QObject(parent), next_task_id_(1) { - setObjectName(QLatin1String(metaObject()->className())); + setObjectName(QLatin1String(QObject::metaObject()->className())); } diff --git a/src/covermanager/albumcoverloader.cpp b/src/covermanager/albumcoverloader.cpp index 705b09635..dd72dfcb2 100644 --- a/src/covermanager/albumcoverloader.cpp +++ b/src/covermanager/albumcoverloader.cpp @@ -64,7 +64,7 @@ AlbumCoverLoader::AlbumCoverLoader(const SharedPtr tagreader_cl load_image_async_id_(1), original_thread_(nullptr) { - setObjectName(QLatin1String(metaObject()->className())); + setObjectName(QLatin1String(QObject::metaObject()->className())); original_thread_ = thread(); diff --git a/src/covermanager/currentalbumcoverloader.cpp b/src/covermanager/currentalbumcoverloader.cpp index df5a4cb8a..4fcabb8d9 100644 --- a/src/covermanager/currentalbumcoverloader.cpp +++ b/src/covermanager/currentalbumcoverloader.cpp @@ -45,7 +45,7 @@ CurrentAlbumCoverLoader::CurrentAlbumCoverLoader(const SharedPtrclassName())); + setObjectName(QLatin1String(QObject::metaObject()->className())); options_.options = AlbumCoverLoaderOptions::Option::RawImageData | AlbumCoverLoaderOptions::Option::OriginalImage | AlbumCoverLoaderOptions::Option::ScaledImage; options_.desired_scaled_size = QSize(120, 120); diff --git a/src/device/devicedatabasebackend.cpp b/src/device/devicedatabasebackend.cpp index 86b0da5d1..7f3cf646b 100644 --- a/src/device/devicedatabasebackend.cpp +++ b/src/device/devicedatabasebackend.cpp @@ -49,7 +49,7 @@ DeviceDatabaseBackend::DeviceDatabaseBackend(QObject *parent) db_(nullptr), original_thread_(nullptr) { - setObjectName(QLatin1String(metaObject()->className())); + setObjectName(QLatin1String(QObject::metaObject()->className())); original_thread_ = thread(); diff --git a/src/device/devicelister.cpp b/src/device/devicelister.cpp index d75100481..28db24b8f 100644 --- a/src/device/devicelister.cpp +++ b/src/device/devicelister.cpp @@ -45,7 +45,7 @@ DeviceLister::DeviceLister(QObject *parent) original_thread_(nullptr), next_mount_request_id_(0) { - setObjectName(QLatin1String(metaObject()->className())); + setObjectName(QLatin1String(QObject::metaObject()->className())); original_thread_ = thread(); diff --git a/src/device/devicemanager.cpp b/src/device/devicemanager.cpp index 571dee134..c5421284f 100644 --- a/src/device/devicemanager.cpp +++ b/src/device/devicemanager.cpp @@ -99,7 +99,7 @@ DeviceManager::DeviceManager(const SharedPtr task_manager, albumcover_loader_(albumcover_loader), not_connected_overlay_(IconLoader::Load(u"edit-delete"_s)) { - setObjectName(QLatin1String(metaObject()->className())); + setObjectName(QLatin1String(QObject::metaObject()->className())); thread_pool_.setMaxThreadCount(1); QObject::connect(&*task_manager, &TaskManager::TasksChanged, this, &DeviceManager::TasksChanged); diff --git a/src/engine/devicefinders.cpp b/src/engine/devicefinders.cpp index bbab7a4f7..e22871e98 100644 --- a/src/engine/devicefinders.cpp +++ b/src/engine/devicefinders.cpp @@ -53,7 +53,7 @@ using namespace Qt::Literals::StringLiterals; DeviceFinders::DeviceFinders(QObject *parent) : QObject(parent) { - setObjectName(QLatin1String(metaObject()->className())); + setObjectName(QLatin1String(QObject::metaObject()->className())); } diff --git a/src/lyrics/lyricsproviders.cpp b/src/lyrics/lyricsproviders.cpp index 6b4afb334..d1e22c221 100644 --- a/src/lyrics/lyricsproviders.cpp +++ b/src/lyrics/lyricsproviders.cpp @@ -44,7 +44,7 @@ using std::make_shared; LyricsProviders::LyricsProviders(QObject *parent) : QObject(parent), thread_(new QThread(this)), network_(make_shared()) { - setObjectName(QLatin1String(metaObject()->className())); + setObjectName(QLatin1String(QObject::metaObject()->className())); thread_->setObjectName(objectName()); network_->moveToThread(thread_); thread_->start(); diff --git a/src/moodbar/moodbarloader.cpp b/src/moodbar/moodbarloader.cpp index 0a7d16d3e..5b32ba908 100644 --- a/src/moodbar/moodbarloader.cpp +++ b/src/moodbar/moodbarloader.cpp @@ -64,7 +64,7 @@ MoodbarLoader::MoodbarLoader(QObject *parent) kMaxActiveRequests(qMax(1, QThread::idealThreadCount() / 2)), save_(false) { - setObjectName(QLatin1String(metaObject()->className())); + setObjectName(QLatin1String(QObject::metaObject()->className())); thread_->setObjectName(objectName()); cache_->setCacheDirectory(StandardPaths::WritableLocation(StandardPaths::StandardLocation::CacheLocation) + u"/moodbar"_s); diff --git a/src/playlist/playlistbackend.cpp b/src/playlist/playlistbackend.cpp index a6e3d267a..7063416bb 100644 --- a/src/playlist/playlistbackend.cpp +++ b/src/playlist/playlistbackend.cpp @@ -69,7 +69,7 @@ PlaylistBackend::PlaylistBackend(const SharedPtr database, collection_backend_(collection_backend), original_thread_(nullptr) { - setObjectName(QLatin1String(metaObject()->className())); + setObjectName(QLatin1String(QObject::metaObject()->className())); original_thread_ = thread(); diff --git a/src/playlist/playlistmanager.cpp b/src/playlist/playlistmanager.cpp index 45eed9091..7e54cd6a2 100644 --- a/src/playlist/playlistmanager.cpp +++ b/src/playlist/playlistmanager.cpp @@ -84,7 +84,7 @@ PlaylistManager::PlaylistManager(const SharedPtr task_manager, active_(-1), playlists_loading_(0) { - setObjectName(QLatin1String(metaObject()->className())); + setObjectName(QLatin1String(QObject::metaObject()->className())); } diff --git a/src/tagreader/tagreaderclient.cpp b/src/tagreader/tagreaderclient.cpp index 04799da9c..2156e4aac 100644 --- a/src/tagreader/tagreaderclient.cpp +++ b/src/tagreader/tagreaderclient.cpp @@ -59,7 +59,7 @@ TagReaderClient::TagReaderClient(QObject *parent) abort_(false), processing_(false) { - setObjectName(QLatin1String(metaObject()->className())); + setObjectName(QLatin1String(QObject::metaObject()->className())); if (!sInstance) { sInstance = this;