Funkwhale
/
strawberry-audio-player-windows-mac-linux
mirror of https://github.com/strawberrymusicplayer/strawberry
1
0
Fork 0
Code Issues Releases Wiki Activity

Use std::make_unique / std::make_shared

This commit is contained in:
Jonas Kvinge 2021-07-01 01:56:35 +02:00
parent 0e8ae1a206
commit b9f3f80d50
4 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/macsystemtrayicon.mm
View File

@ -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) { 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<MacSystemTrayIconPrivate>();
SetupMenuItem(previous); SetupMenuItem(previous);
SetupMenuItem(play); SetupMenuItem(play);
SetupMenuItem(stop); SetupMenuItem(stop);

2
src/smartplaylists/smartplaylistsearchpreview.cpp
View File

@ -110,7 +110,7 @@ PlaylistItemList DoRunSearch(PlaylistGeneratorPtr gen) { return gen->Generate();
void SmartPlaylistSearchPreview::RunSearch(const SmartPlaylistSearch &search) { void SmartPlaylistSearchPreview::RunSearch(const SmartPlaylistSearch &search) {
generator_.reset(new PlaylistQueryGenerator); generator_ = std::make_shared<PlaylistQueryGenerator>();
generator_->set_collection(backend_); generator_->set_collection(backend_);
std::dynamic_pointer_cast<PlaylistQueryGenerator>(generator_)->Load(search); std::dynamic_pointer_cast<PlaylistQueryGenerator>(generator_)->Load(search);

2
tests/src/collectionbackend_test.cpp
View File

@ -46,7 +46,7 @@ class CollectionBackendTest : public ::testing::Test {
void SetUp() override { void SetUp() override {
database_.reset(new MemoryDatabase(nullptr)); database_.reset(new MemoryDatabase(nullptr));
backend_ = std::make_unique<CollectionBackend>(); backend_ = std::make_unique<CollectionBackend>();
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) { static Song MakeDummySong(int directory_id) {

34
tests/src/collectionmodel_test.cpp
View File

@ -49,14 +49,14 @@ class CollectionModelTest : public ::testing::Test {
protected: protected:
void SetUp() override { void SetUp() override {
database_.reset(new MemoryDatabase(nullptr)); database_ = std::make_shared<MemoryDatabase>(nullptr);
backend_.reset(new CollectionBackend); backend_ = std::make_unique<CollectionBackend>();
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);
model_.reset(new CollectionModel(backend_.get(), nullptr)); model_ = std::make_unique<CollectionModel>(backend_.get(), nullptr);
added_dir_ = false; added_dir_ = false;
model_sorted_.reset(new QSortFilterProxyModel); model_sorted_ = std::make_unique<QSortFilterProxyModel>();
model_sorted_->setSourceModel(model_.get()); model_sorted_->setSourceModel(model_.get());
model_sorted_->setSortRole(CollectionModel::Role_SortText); model_sorted_->setSortRole(CollectionModel::Role_SortText);
model_sorted_->setDynamicSortFilter(true); model_sorted_->setDynamicSortFilter(true);
@ -558,18 +558,18 @@ TEST_F(CollectionModelTest, TestContainerNodes) {
std::unique_ptr<CollectionModel> model2; std::unique_ptr<CollectionModel> model2;
std::unique_ptr<CollectionModel> model3; std::unique_ptr<CollectionModel> model3;
database1.reset(new MemoryDatabase(nullptr)); database1 = std::make_unique<MemoryDatabase>(nullptr);
database2.reset(new MemoryDatabase(nullptr)); database2 = std::make_unique<MemoryDatabase>(nullptr);
database3.reset(new MemoryDatabase(nullptr)); database3 = std::make_unique<MemoryDatabase>(nullptr);
backend1.reset(new CollectionBackend); backend1 = std::make_unique<CollectionBackend>();
backend2.reset(new CollectionBackend); backend2= std::make_unique<CollectionBackend>();
backend3.reset(new CollectionBackend); backend3 = std::make_unique<CollectionBackend>();
backend1->Init(database1.get(), Song::Source_Collection, SCollection::kSongsTable, SCollection::kDirsTable, SCollection::kSubdirsTable, SCollection::kFtsTable); 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::kDirsTable, SCollection::kSubdirsTable, SCollection::kFtsTable); 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::kDirsTable, SCollection::kSubdirsTable, SCollection::kFtsTable); backend3->Init(database3.get(), Song::Source_Collection, SCollection::kSongsTable, SCollection::kFtsTable, SCollection::kDirsTable, SCollection::kSubdirsTable);
model1.reset(new CollectionModel(backend1.get(), nullptr)); model1 = std::make_unique<CollectionModel>(backend1.get(), nullptr);
model2.reset(new CollectionModel(backend2.get(), nullptr)); model2 = std::make_unique<CollectionModel>(backend2.get(), nullptr);
model3.reset(new CollectionModel(backend3.get(), nullptr)); model3 = std::make_unique<CollectionModel>(backend3.get(), nullptr);
backend1->AddDirectory("/mnt/music"); backend1->AddDirectory("/mnt/music");
backend2->AddDirectory("/mnt/music"); backend2->AddDirectory("/mnt/music");