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

SmartPlaylists: Rename variable collection to collection_backend

This commit is contained in:
Jonas Kvinge 2023-03-11 17:18:35 +01:00
parent ec4d036f50
commit 604aa63b47
8 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/smartplaylists/smartplaylistquerywizardplugin.cpp
View File

@ -80,8 +80,8 @@ class SmartPlaylistQueryWizardPlugin::SortPage : public QWizardPage { // clazy:
SmartPlaylistQueryWizardPlugin *plugin_;
};
SmartPlaylistQueryWizardPlugin::SmartPlaylistQueryWizardPlugin(Application *app, CollectionBackend *collection, QObject *parent)
: SmartPlaylistWizardPlugin(app, collection, parent),
SmartPlaylistQueryWizardPlugin::SmartPlaylistQueryWizardPlugin(Application *app, CollectionBackend *collection_backend, QObject *parent)
: SmartPlaylistWizardPlugin(app, collection_backend, parent),
search_page_(nullptr),
previous_scrollarea_max_(0) {}
@ -107,7 +107,7 @@ int SmartPlaylistQueryWizardPlugin::CreatePages(QWizard *wizard, int finish_page
QObject::connect(search_page_->ui_->type, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &SmartPlaylistQueryWizardPlugin::SearchTypeChanged);
// Create the new search term widget
search_page_->new_term_ = new SmartPlaylistSearchTermWidget(collection_, search_page_);
search_page_->new_term_ = new SmartPlaylistSearchTermWidget(collection_backend_, search_page_);
search_page_->new_term_->SetActive(false);
QObject::connect(search_page_->new_term_, &SmartPlaylistSearchTermWidget::Clicked, this, &SmartPlaylistQueryWizardPlugin::AddSearchTerm);
@ -124,7 +124,7 @@ int SmartPlaylistQueryWizardPlugin::CreatePages(QWizard *wizard, int finish_page
terms_page_layout->addStretch();
search_page_->preview_ = new SmartPlaylistSearchPreview(search_page_);
search_page_->preview_->set_application(app_);
search_page_->preview_->set_collection(collection_);
search_page_->preview_->set_collection(collection_backend_);
terms_page_layout->addWidget(search_page_->preview_);
// Add sort field texts
@ -143,7 +143,7 @@ int SmartPlaylistQueryWizardPlugin::CreatePages(QWizard *wizard, int finish_page
// Set up the preview widget that's already at the bottom of the sort page
sort_ui_->preview->set_application(app_);
sort_ui_->preview->set_collection(collection_);
sort_ui_->preview->set_collection(collection_backend_);
QObject::connect(sort_ui_->field, &QRadioButton::toggled, this, &SmartPlaylistQueryWizardPlugin::UpdateSortPreview);
QObject::connect(sort_ui_->field_value, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &SmartPlaylistQueryWizardPlugin::UpdateSortPreview);
QObject::connect(sort_ui_->limit_limit, &QRadioButton::toggled, this, &SmartPlaylistQueryWizardPlugin::UpdateSortPreview);
@ -230,7 +230,7 @@ void SmartPlaylistQueryWizardPlugin::UpdateSortOrder() {
void SmartPlaylistQueryWizardPlugin::AddSearchTerm() {
SmartPlaylistSearchTermWidget *widget = new SmartPlaylistSearchTermWidget(collection_, search_page_);
SmartPlaylistSearchTermWidget *widget = new SmartPlaylistSearchTermWidget(collection_backend_, search_page_);
QObject::connect(widget, &SmartPlaylistSearchTermWidget::RemoveClicked, this, &SmartPlaylistQueryWizardPlugin::RemoveSearchTerm);
QObject::connect(widget, &SmartPlaylistSearchTermWidget::Changed, this, &SmartPlaylistQueryWizardPlugin::UpdateTermPreview);

2
src/smartplaylists/smartplaylistquerywizardplugin.h
View File

@ -41,7 +41,7 @@ class SmartPlaylistQueryWizardPlugin : public SmartPlaylistWizardPlugin {
Q_OBJECT
public:
explicit SmartPlaylistQueryWizardPlugin(Application *app, CollectionBackend *collection, QObject *parent);
explicit SmartPlaylistQueryWizardPlugin(Application *app, CollectionBackend *collection_backend, QObject *parent);
~SmartPlaylistQueryWizardPlugin() override;
PlaylistGenerator::Type type() const override { return PlaylistGenerator::Type::Query; }

8
src/smartplaylists/smartplaylistsearchtermwidget.cpp
View File

@ -73,10 +73,10 @@ class SmartPlaylistSearchTermWidget::Overlay : public QWidget { // clazy:exclud
const int SmartPlaylistSearchTermWidget::Overlay::kSpacing = 6;
const int SmartPlaylistSearchTermWidget::Overlay::kIconSize = 22;
SmartPlaylistSearchTermWidget::SmartPlaylistSearchTermWidget(CollectionBackend *collection, QWidget *parent)
SmartPlaylistSearchTermWidget::SmartPlaylistSearchTermWidget(CollectionBackend *collection_backend, QWidget *parent)
: QWidget(parent),
ui_(new Ui_SmartPlaylistSearchTermWidget),
collection_(collection),
collection_backend_(collection_backend),
overlay_(nullptr),
animation_(new QPropertyAnimation(this, "overlay_opacity", this)),
active_(true),
@ -187,11 +187,11 @@ void SmartPlaylistSearchTermWidget::FieldChanged(int index) {
// Maybe set a tag completer
switch (field) {
case SmartPlaylistSearchTerm::Field::Artist:
new TagCompleter(collection_, Playlist::Column_Artist, ui_->value_text);
new TagCompleter(collection_backend_, Playlist::Column_Artist, ui_->value_text);
break;
case SmartPlaylistSearchTerm::Field::Album:
new TagCompleter(collection_, Playlist::Column_Album, ui_->value_text);
new TagCompleter(collection_backend_, Playlist::Column_Album, ui_->value_text);
break;
default:

4
src/smartplaylists/smartplaylistsearchtermwidget.h
View File

@ -43,7 +43,7 @@ class SmartPlaylistSearchTermWidget : public QWidget {
Q_PROPERTY(float overlay_opacity READ overlay_opacity WRITE set_overlay_opacity)
public:
explicit SmartPlaylistSearchTermWidget(CollectionBackend *collection, QWidget *parent);
explicit SmartPlaylistSearchTermWidget(CollectionBackend *collection_backend, QWidget *parent);
~SmartPlaylistSearchTermWidget() override;
void SetActive(const bool active);
@ -81,7 +81,7 @@ class SmartPlaylistSearchTermWidget : public QWidget {
friend class Overlay;
Ui_SmartPlaylistSearchTermWidget *ui_;
CollectionBackend *collection_;
CollectionBackend *collection_backend_;
Overlay *overlay_;
QPropertyAnimation *animation_;

6
src/smartplaylists/smartplaylistwizard.cpp
View File

@ -58,10 +58,10 @@ class SmartPlaylistWizard::FinishPage : public QWizardPage { // clazy:exclude=m
};
SmartPlaylistWizard::SmartPlaylistWizard(Application *app, CollectionBackend *collection, QWidget *parent)
SmartPlaylistWizard::SmartPlaylistWizard(Application *app, CollectionBackend *collection_backend, QWidget *parent)
: QWizard(parent),
app_(app),
collection_(collection),
collection_backend_(collection_backend),
type_page_(new TypePage(this)),
finish_page_(new FinishPage(this)),
type_index_(-1) {
@ -88,7 +88,7 @@ SmartPlaylistWizard::SmartPlaylistWizard(Application *app, CollectionBackend *co
finish_id_ = addPage(finish_page_);
new QVBoxLayout(type_page_);
AddPlugin(new SmartPlaylistQueryWizardPlugin(app_, collection_, this));
AddPlugin(new SmartPlaylistQueryWizardPlugin(app_, collection_backend, this));
// Skip the type page - remove this when we have more than one type
setStartId(2);

4
src/smartplaylists/smartplaylistwizard.h
View File

@ -35,7 +35,7 @@ class SmartPlaylistWizard : public QWizard {
Q_OBJECT
public:
explicit SmartPlaylistWizard(Application *app, CollectionBackend *collection, QWidget *parent);
explicit SmartPlaylistWizard(Application *app, CollectionBackend *collection_backend, QWidget *parent);
~SmartPlaylistWizard() override;
void SetGenerator(PlaylistGeneratorPtr gen);
@ -55,7 +55,7 @@ class SmartPlaylistWizard : public QWizard {
private:
Application *app_;
CollectionBackend *collection_;
CollectionBackend *collection_backend_;
TypePage *type_page_;
FinishPage *finish_page_;
int finish_id_;

4
src/smartplaylists/smartplaylistwizardplugin.cpp
View File

@ -25,10 +25,10 @@
#include "smartplaylistwizardplugin.h"
SmartPlaylistWizardPlugin::SmartPlaylistWizardPlugin(Application *app, CollectionBackend *collection, QObject *parent)
SmartPlaylistWizardPlugin::SmartPlaylistWizardPlugin(Application *app, CollectionBackend *collection_backend, QObject *parent)
: QObject(parent),
app_(app),
collection_(collection),
collection_backend_(collection_backend),
start_page_(-1) {}
void SmartPlaylistWizardPlugin::Init(QWizard *wizard, const int finish_page_id) {

4
src/smartplaylists/smartplaylistwizardplugin.h
View File

@ -34,7 +34,7 @@ class SmartPlaylistWizardPlugin : public QObject {
Q_OBJECT
public:
explicit SmartPlaylistWizardPlugin(Application *app, CollectionBackend *collection, QObject *parent);
explicit SmartPlaylistWizardPlugin(Application *app, CollectionBackend *collection_backend, QObject *parent);
virtual PlaylistGenerator::Type type() const = 0;
virtual QString name() const = 0;
@ -51,7 +51,7 @@ class SmartPlaylistWizardPlugin : public QObject {
virtual int CreatePages(QWizard *wizard, const int finish_page_id) = 0;
Application *app_;
CollectionBackend *collection_;
CollectionBackend *collection_backend_;
private:
int start_page_;