dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace use of C-style casts

Browse Source
This commit is contained in:
Jonas Kvinge
2022-06-13 00:23:42 +02:00
parent abdcadb5fa
commit d82fd421ed
39 changed files with 95 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/smartplaylists/playlistquerygenerator.cpp
View File

@@ -93,7 +93,7 @@ PlaylistItemList PlaylistQueryGenerator::GenerateMore(const int count) {
PlaylistItemList items;
items.reserve(songs.count());
for (const Song &song : songs) {
items << PlaylistItemPtr(PlaylistItem::NewFromSong(song));
items << PlaylistItem::NewFromSong(song);
previous_ids_ << song.id();
if (previous_ids_.count() > GetDynamicFuture() + GetDynamicHistory()) {

8
src/smartplaylists/smartplaylistquerywizardplugin.cpp
View File

@@ -130,7 +130,7 @@ int SmartPlaylistQueryWizardPlugin::CreatePages(QWizard *wizard, int finish_page
// Add sort field texts
for (int i = 0; i < SmartPlaylistSearchTerm::FieldCount; ++i) {
const SmartPlaylistSearchTerm::Field field = SmartPlaylistSearchTerm::Field(i);
const SmartPlaylistSearchTerm::Field field = static_cast<SmartPlaylistSearchTerm::Field>(i);
const QString field_name = SmartPlaylistSearchTerm::FieldName(field);
sort_ui_->field_value->addItem(field_name);
}
@@ -216,7 +216,7 @@ PlaylistGeneratorPtr SmartPlaylistQueryWizardPlugin::CreateGenerator() const {
void SmartPlaylistQueryWizardPlugin::UpdateSortOrder() {
const SmartPlaylistSearchTerm::Field field = SmartPlaylistSearchTerm::Field(sort_ui_->field_value->currentIndex());
const SmartPlaylistSearchTerm::Field field = static_cast<SmartPlaylistSearchTerm::Field>(sort_ui_->field_value->currentIndex());
const SmartPlaylistSearchTerm::Type type = SmartPlaylistSearchTerm::TypeOf(field);
const QString asc = SmartPlaylistSearchTerm::FieldSortOrderText(type, true);
const QString desc = SmartPlaylistSearchTerm::FieldSortOrderText(type, false);
@@ -283,7 +283,7 @@ SmartPlaylistSearch SmartPlaylistQueryWizardPlugin::MakeSearch() const {
SmartPlaylistSearch ret;
// Search type
ret.search_type_ = SmartPlaylistSearch::SearchType(search_page_->ui_->type->currentIndex());
ret.search_type_ = static_cast<SmartPlaylistSearch::SearchType>(search_page_->ui_->type->currentIndex());
// Search terms
for (SmartPlaylistSearchTermWidget *widget : search_page_->terms_) {
@@ -298,7 +298,7 @@ SmartPlaylistSearch SmartPlaylistQueryWizardPlugin::MakeSearch() const {
else {
const bool ascending = sort_ui_->order->currentIndex() == 0;
ret.sort_type_ = ascending ? SmartPlaylistSearch::Sort_FieldAsc : SmartPlaylistSearch::Sort_FieldDesc;
ret.sort_field_ = SmartPlaylistSearchTerm::Field(sort_ui_->field_value->currentIndex());
ret.sort_field_ = static_cast<SmartPlaylistSearchTerm::Field>(sort_ui_->field_value->currentIndex());
}
// Limit

14
src/smartplaylists/smartplaylistsearch.cpp
View File

@@ -125,10 +125,10 @@ bool SmartPlaylistSearch::operator==(const SmartPlaylistSearch &other) const {
QDataStream &operator<<(QDataStream &s, const SmartPlaylistSearch &search) {
s << search.terms_;
s << quint8(search.sort_type_);
s << quint8(search.sort_field_);
s << qint32(search.limit_);
s << quint8(search.search_type_);
s << static_cast<quint8>(search.sort_type_);
s << static_cast<quint8>(search.sort_field_);
s << static_cast<quint32>(search.limit_);
s << static_cast<quint8>(search.search_type_);
return s;
}
@@ -139,10 +139,10 @@ QDataStream &operator>>(QDataStream &s, SmartPlaylistSearch &search) {
qint32 limit = 0;
s >> search.terms_ >> sort_type >> sort_field >> limit >> search_type;
search.sort_type_ = SmartPlaylistSearch::SortType(sort_type);
search.sort_field_ = SmartPlaylistSearchTerm::Field(sort_field);
search.sort_type_ = static_cast<SmartPlaylistSearch::SortType>(sort_type);
search.sort_field_ = static_cast<SmartPlaylistSearchTerm::Field>(sort_field);
search.limit_ = limit;
search.search_type_ = SmartPlaylistSearch::SearchType(search_type);
search.search_type_ = static_cast<SmartPlaylistSearch::SearchType>(search_type);
return s;

12
src/smartplaylists/smartplaylistsearchterm.cpp
View File

@@ -460,11 +460,11 @@ QString SmartPlaylistSearchTerm::DateName(const DateType date, const bool forQue
QDataStream &operator<<(QDataStream &s, const SmartPlaylistSearchTerm &term) {
s << quint8(term.field_);
s << quint8(term.operator_);
s << static_cast<quint8>(term.field_);
s << static_cast<quint8>(term.operator_);
s << term.value_;
s << term.second_value_;
s << quint8(term.date_);
s << static_cast<quint8>(term.date_);
return s;
}
@@ -473,9 +473,9 @@ QDataStream &operator>>(QDataStream &s, SmartPlaylistSearchTerm &term) {
quint8 field = 0, op = 0, date = 0;
s >> field >> op >> term.value_ >> term.second_value_ >> date;
term.field_ = SmartPlaylistSearchTerm::Field(field);
term.operator_ = SmartPlaylistSearchTerm::Operator(op);
term.date_ = SmartPlaylistSearchTerm::DateType(date);
term.field_ = static_cast<SmartPlaylistSearchTerm::Field>(field);
term.operator_ = static_cast<SmartPlaylistSearchTerm::Operator>(op);
term.date_ = static_cast<SmartPlaylistSearchTerm::DateType>(date);
return s;
}

14
src/smartplaylists/smartplaylistsearchtermwidget.cpp
View File

@@ -105,17 +105,17 @@ SmartPlaylistSearchTermWidget::SmartPlaylistSearchTermWidget(CollectionBackend *
// Populate the combo boxes
for (int i = 0; i < SmartPlaylistSearchTerm::FieldCount; ++i) {
ui_->field->addItem(SmartPlaylistSearchTerm::FieldName(SmartPlaylistSearchTerm::Field(i)));
ui_->field->addItem(SmartPlaylistSearchTerm::FieldName(static_cast<SmartPlaylistSearchTerm::Field>(i)));
ui_->field->setItemData(i, i);
}
ui_->field->model()->sort(0);
// Populate the date type combo box
for (int i = 0; i < 5; ++i) {
ui_->date_type->addItem(SmartPlaylistSearchTerm::DateName(SmartPlaylistSearchTerm::DateType(i), false));
ui_->date_type->addItem(SmartPlaylistSearchTerm::DateName(static_cast<SmartPlaylistSearchTerm::DateType>(i), false));
ui_->date_type->setItemData(i, i);
ui_->date_type_relative->addItem(SmartPlaylistSearchTerm::DateName(SmartPlaylistSearchTerm::DateType(i), false));
ui_->date_type_relative->addItem(SmartPlaylistSearchTerm::DateName(static_cast<SmartPlaylistSearchTerm::DateType>(i), false));
ui_->date_type_relative->setItemData(i, i);
}
@@ -141,7 +141,7 @@ SmartPlaylistSearchTermWidget::~SmartPlaylistSearchTermWidget() { delete ui_; }
void SmartPlaylistSearchTermWidget::FieldChanged(int index) {
SmartPlaylistSearchTerm::Field field = SmartPlaylistSearchTerm::Field(ui_->field->itemData(index).toInt());
SmartPlaylistSearchTerm::Field field = static_cast<SmartPlaylistSearchTerm::Field>(ui_->field->itemData(index).toInt());
SmartPlaylistSearchTerm::Type type = SmartPlaylistSearchTerm::TypeOf(field);
// Populate the operator combo box
@@ -371,8 +371,8 @@ SmartPlaylistSearchTerm SmartPlaylistSearchTermWidget::Term() const {
const int op = ui_->op->itemData(ui_->op->currentIndex()).toInt();
SmartPlaylistSearchTerm ret;
ret.field_ = SmartPlaylistSearchTerm::Field(field);
ret.operator_ = SmartPlaylistSearchTerm::Operator(op);
ret.field_ = static_cast<SmartPlaylistSearchTerm::Field>(field);
ret.operator_ = static_cast<SmartPlaylistSearchTerm::Operator>(op);
// The value depends on the data type
const QWidget *value_page = ui_->value_stack->currentWidget();
@@ -392,7 +392,7 @@ SmartPlaylistSearchTerm SmartPlaylistSearchTermWidget::Term() const {
ret.value_ = QTime(0, 0).secsTo(ui_->value_time->time());
}
else if (value_page == ui_->page_date_numeric) {
ret.date_ = SmartPlaylistSearchTerm::DateType(ui_->date_type->currentIndex());
ret.date_ = static_cast<SmartPlaylistSearchTerm::DateType>(ui_->date_type->currentIndex());
ret.value_ = ui_->value_date_numeric->value();
}
else if (value_page == ui_->page_date_relative) {