From b9f3f80d5077f43be9780157e9e22d1c823a0c50 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Thu, 1 Jul 2021 01:56:35 +0200 Subject: [PATCH] Use std::make_unique / std::make_shared --- src/core/macsystemtrayicon.mm | 3 +- .../smartplaylistsearchpreview.cpp | 2 +- tests/src/collectionbackend_test.cpp | 2 +- tests/src/collectionmodel_test.cpp | 34 +++++++++---------- 4 files changed, 21 insertions(+), 20 deletions(-) diff --git a/src/core/macsystemtrayicon.mm b/src/core/macsystemtrayicon.mm index b6ceb652..919f2dee 100644 --- a/src/core/macsystemtrayicon.mm +++ b/src/core/macsystemtrayicon.mm @@ -174,7 +174,8 @@ void SystemTrayIcon::SetTrayiconProgress(const bool enabled) { void SystemTrayIcon::SetupMenu(QAction *previous, QAction *play, QAction *stop, QAction *stop_after, QAction *next, QAction *mute, QAction *love, QAction *quit) { - p_.reset(new MacSystemTrayIconPrivate()); + p_ = std::make_unique(); + SetupMenuItem(previous); SetupMenuItem(play); SetupMenuItem(stop); diff --git a/src/smartplaylists/smartplaylistsearchpreview.cpp b/src/smartplaylists/smartplaylistsearchpreview.cpp index e9e7fae3..f81c0377 100644 --- a/src/smartplaylists/smartplaylistsearchpreview.cpp +++ b/src/smartplaylists/smartplaylistsearchpreview.cpp @@ -110,7 +110,7 @@ PlaylistItemList DoRunSearch(PlaylistGeneratorPtr gen) { return gen->Generate(); void SmartPlaylistSearchPreview::RunSearch(const SmartPlaylistSearch &search) { - generator_.reset(new PlaylistQueryGenerator); + generator_ = std::make_shared(); generator_->set_collection(backend_); std::dynamic_pointer_cast(generator_)->Load(search); diff --git a/tests/src/collectionbackend_test.cpp b/tests/src/collectionbackend_test.cpp index b50dda45..f3662256 100644 --- a/tests/src/collectionbackend_test.cpp +++ b/tests/src/collectionbackend_test.cpp @@ -46,7 +46,7 @@ class CollectionBackendTest : public ::testing::Test { void SetUp() override { database_.reset(new MemoryDatabase(nullptr)); backend_ = std::make_unique(); - backend_->Init(database_.get(), Song::Source_Collection, SCollection::kSongsTable, SCollection::kDirsTable, SCollection::kSubdirsTable, SCollection::kFtsTable); + backend_->Init(database_.get(), Song::Source_Collection, SCollection::kSongsTable, SCollection::kFtsTable, SCollection::kDirsTable, SCollection::kSubdirsTable); } static Song MakeDummySong(int directory_id) { diff --git a/tests/src/collectionmodel_test.cpp b/tests/src/collectionmodel_test.cpp index 417dc513..ffd636ae 100644 --- a/tests/src/collectionmodel_test.cpp +++ b/tests/src/collectionmodel_test.cpp @@ -49,14 +49,14 @@ class CollectionModelTest : public ::testing::Test { protected: void SetUp() override { - database_.reset(new MemoryDatabase(nullptr)); - backend_.reset(new CollectionBackend); - backend_->Init(database_.get(), Song::Source_Collection, SCollection::kSongsTable, SCollection::kDirsTable, SCollection::kSubdirsTable, SCollection::kFtsTable); - model_.reset(new CollectionModel(backend_.get(), nullptr)); + database_ = std::make_shared(nullptr); + backend_ = std::make_unique(); + backend_->Init(database_.get(), Song::Source_Collection, SCollection::kSongsTable, SCollection::kFtsTable, SCollection::kDirsTable, SCollection::kSubdirsTable); + model_ = std::make_unique(backend_.get(), nullptr); added_dir_ = false; - model_sorted_.reset(new QSortFilterProxyModel); + model_sorted_ = std::make_unique(); model_sorted_->setSourceModel(model_.get()); model_sorted_->setSortRole(CollectionModel::Role_SortText); model_sorted_->setDynamicSortFilter(true); @@ -558,18 +558,18 @@ TEST_F(CollectionModelTest, TestContainerNodes) { std::unique_ptr model2; std::unique_ptr model3; - database1.reset(new MemoryDatabase(nullptr)); - database2.reset(new MemoryDatabase(nullptr)); - database3.reset(new MemoryDatabase(nullptr)); - backend1.reset(new CollectionBackend); - backend2.reset(new CollectionBackend); - backend3.reset(new CollectionBackend); - backend1->Init(database1.get(), Song::Source_Collection, SCollection::kSongsTable, SCollection::kDirsTable, SCollection::kSubdirsTable, SCollection::kFtsTable); - backend2->Init(database2.get(), Song::Source_Collection, SCollection::kSongsTable, SCollection::kDirsTable, SCollection::kSubdirsTable, SCollection::kFtsTable); - backend3->Init(database3.get(), Song::Source_Collection, SCollection::kSongsTable, SCollection::kDirsTable, SCollection::kSubdirsTable, SCollection::kFtsTable); - model1.reset(new CollectionModel(backend1.get(), nullptr)); - model2.reset(new CollectionModel(backend2.get(), nullptr)); - model3.reset(new CollectionModel(backend3.get(), nullptr)); + database1 = std::make_unique(nullptr); + database2 = std::make_unique(nullptr); + database3 = std::make_unique(nullptr); + backend1 = std::make_unique(); + backend2= std::make_unique(); + backend3 = std::make_unique(); + backend1->Init(database1.get(), Song::Source_Collection, SCollection::kSongsTable, SCollection::kFtsTable, SCollection::kDirsTable, SCollection::kSubdirsTable); + backend2->Init(database2.get(), Song::Source_Collection, SCollection::kSongsTable, SCollection::kFtsTable, SCollection::kDirsTable, SCollection::kSubdirsTable); + backend3->Init(database3.get(), Song::Source_Collection, SCollection::kSongsTable, SCollection::kFtsTable, SCollection::kDirsTable, SCollection::kSubdirsTable); + model1 = std::make_unique(backend1.get(), nullptr); + model2 = std::make_unique(backend2.get(), nullptr); + model3 = std::make_unique(backend3.get(), nullptr); backend1->AddDirectory("/mnt/music"); backend2->AddDirectory("/mnt/music");