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

Replace use of C-style casts

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/libstrawberry-common/core/messagehandler.cpp
View File

@ -98,7 +98,7 @@ void _MessageHandlerBase::DeviceReadyRead() {
void _MessageHandlerBase::WriteMessage(const QByteArray &data) {
QDataStream s(device_);
s << quint32(data.length());
s << static_cast<quint32>(data.length());
s.writeRawData(data.data(), static_cast<int>(data.length()));
// Sorry.

2
src/collection/collectionbackend.cpp
View File

@ -1479,7 +1479,7 @@ CollectionBackend::AlbumList CollectionBackend::GetAlbums(const QString &artist,
info.art_manual = QUrl::fromLocalFile(art_manual);
}
info.filetype = Song::FileType(query.Value(6).toInt());
info.filetype = static_cast<Song::FileType>(query.Value(6).toInt());
QString filetype = Song::TextForFiletype(info.filetype);
info.cue_path = query.Value(7).toString();

12
src/collection/collectionmodel.cpp
View File

@ -1339,14 +1339,14 @@ CollectionItem *CollectionModel::ItemFromQuery(const GroupBy type, const bool si
break;
}
case GroupBy_FileType:{
item->metadata.set_filetype(Song::FileType(row.value(0).toInt()));
item->metadata.set_filetype(static_cast<Song::FileType>(row.value(0).toInt()));
item->key.append(ContainerKey(type, item->metadata));
item->display_text = item->metadata.TextForFiletype();
item->sort_text = item->metadata.TextForFiletype();
break;
}
case GroupBy_Format:{
item->metadata.set_filetype(Song::FileType(row.value(0).toInt()));
item->metadata.set_filetype(static_cast<Song::FileType>(row.value(0).toInt()));
item->metadata.set_samplerate(row.value(1).toInt());
item->metadata.set_bitdepth(row.value(2).toInt());
QString key = ContainerKey(type, item->metadata);
@ -1949,7 +1949,7 @@ void CollectionModel::ExpandAll(CollectionItem *item) const {
}
QDataStream &operator<<(QDataStream &s, const CollectionModel::Grouping g) {
s << quint32(g.first) << quint32(g.second) << quint32(g.third);
s << static_cast<quint32>(g.first) << static_cast<quint32>(g.second) << static_cast<quint32>(g.third);
return s;
}
@ -1957,11 +1957,11 @@ QDataStream &operator>>(QDataStream &s, CollectionModel::Grouping &g) {
quint32 buf = 0;
s >> buf;
g.first = CollectionModel::GroupBy(buf);
g.first = static_cast<CollectionModel::GroupBy>(buf);
s >> buf;
g.second = CollectionModel::GroupBy(buf);
g.second = static_cast<CollectionModel::GroupBy>(buf);
s >> buf;
g.third = CollectionModel::GroupBy(buf);
g.third = static_cast<CollectionModel::GroupBy>(buf);
return s;
}

2
src/context/contextalbum.cpp
View File

@ -179,7 +179,7 @@ void ContextAlbum::SetImage(QImage image) {
void ContextAlbum::DrawImage(QPainter *p, const QPixmap &pixmap, const qreal opacity) {
if (qFuzzyCompare(opacity, qreal(0.0))) return;
if (qFuzzyCompare(opacity, static_cast<qreal>(0.0))) return;
p->setOpacity(opacity);
p->drawPixmap(0, 0, pixmap.width(), pixmap.height(), pixmap);

8
src/core/commandlineoptions.cpp
View File

@ -369,8 +369,8 @@ QString CommandlineOptions::tr(const char *source_text) {
QDataStream &operator<<(QDataStream &s, const CommandlineOptions &a) {
s << qint32(a.player_action_)
<< qint32(a.url_list_action_)
s << static_cast<qint64>(a.player_action_)
<< static_cast<qint64>(a.url_list_action_)
<< a.set_volume_
<< a.volume_modifier_
<< a.seek_to_
@ -406,8 +406,8 @@ QDataStream &operator>>(QDataStream &s, CommandlineOptions &a) {
>> a.playlist_name_
>> a.window_size_;
a.player_action_ = CommandlineOptions::PlayerAction(player_action);
a.url_list_action_ = CommandlineOptions::UrlListAction(url_list_action);
a.player_action_ = static_cast<CommandlineOptions::PlayerAction>(player_action);
a.url_list_action_ = static_cast<CommandlineOptions::UrlListAction>(url_list_action);
return s;

4
src/core/mainwindow.cpp
View File

@ -921,7 +921,7 @@ MainWindow::MainWindow(Application *app, std::shared_ptr<SystemTrayIcon> tray_ic
ui_->tabs->setCurrentIndex(settings_.value("current_tab", 1).toInt());
FancyTabWidget::Mode default_mode = FancyTabWidget::Mode_LargeSidebar;
int tab_mode_int = settings_.value("tab_mode", default_mode).toInt();
FancyTabWidget::Mode tab_mode = FancyTabWidget::Mode(tab_mode_int);
FancyTabWidget::Mode tab_mode = static_cast<FancyTabWidget::Mode>(tab_mode_int);
if (tab_mode == FancyTabWidget::Mode_None) tab_mode = default_mode;
ui_->tabs->SetMode(tab_mode);
@ -2179,7 +2179,7 @@ void MainWindow::EditValue() {
if (column == -1) {
for (int i = 0; i < ui_->playlist->view()->model()->columnCount(); ++i) {
if (ui_->playlist->view()->isColumnHidden(i)) continue;
if (!Playlist::column_is_editable(Playlist::Column(i))) continue;
if (!Playlist::column_is_editable(static_cast<Playlist::Column>(i))) continue;
column = i;
break;
}

4
src/core/utilities.cpp
View File

@ -209,7 +209,7 @@ quint64 FileSystemCapacity(const QString &path) {
#if defined(Q_OS_UNIX)
struct statvfs fs_info {};
if (statvfs(path.toLocal8Bit().constData(), &fs_info) == 0)
return quint64(fs_info.f_blocks) * quint64(fs_info.f_bsize);
return static_cast<quint64>(fs_info.f_blocks) * static_cast<quint64>(fs_info.f_bsize);
#elif defined(Q_OS_WIN32)
_ULARGE_INTEGER ret;
ScopedWCharArray wchar(QDir::toNativeSeparators(path));
@ -226,7 +226,7 @@ quint64 FileSystemFreeSpace(const QString &path) {
#if defined(Q_OS_UNIX)
struct statvfs fs_info {};
if (statvfs(path.toLocal8Bit().constData(), &fs_info) == 0)
return quint64(fs_info.f_bavail) * quint64(fs_info.f_bsize);
return static_cast<quint64>(fs_info.f_bavail) * static_cast<quint64>(fs_info.f_bsize);
#elif defined(Q_OS_WIN32)
_ULARGE_INTEGER ret;
ScopedWCharArray wchar(QDir::toNativeSeparators(path));

4
src/covermanager/albumcovermanager.cpp
View File

@ -658,7 +658,7 @@ Song AlbumCoverManager::ItemAsSong(AlbumItem *item) {
result.set_albumartist(item->data(Role_AlbumArtist).toString());
result.set_album(item->data(Role_Album).toString());
result.set_filetype(Song::FileType(item->data(Role_Filetype).toInt()));
result.set_filetype(static_cast<Song::FileType>(item->data(Role_Filetype).toInt()));
result.set_url(item->urls.first());
result.set_cue_path(item->data(Role_CuePath).toString());
@ -969,7 +969,7 @@ void AlbumCoverManager::SaveAndSetCover(AlbumItem *item, const AlbumCoverImageRe
const QString albumartist = item->data(Role_AlbumArtist).toString();
const QString album = item->data(Role_Album).toString();
const QList<QUrl> &urls = item->urls;
const Song::FileType filetype = Song::FileType(item->data(Role_Filetype).toInt());
const Song::FileType filetype = static_cast<Song::FileType>(item->data(Role_Filetype).toInt());
const bool has_cue = !item->data(Role_CuePath).toString().isEmpty();
if (album_cover_choice_controller_->get_save_album_cover_type() == CollectionSettingsPage::SaveCoverType_Embedded && Song::save_embedded_cover_supported(filetype) && !has_cue) {

4
src/device/connecteddevice.cpp
View File

@ -150,7 +150,7 @@ MusicStorage::TranscodeMode ConnectedDevice::GetTranscodeMode() const {
QModelIndex idx = manager_->ItemToIndex(info);
if (!idx.isValid()) return MusicStorage::TranscodeMode();
return MusicStorage::TranscodeMode(idx.data(DeviceManager::Role_TranscodeMode).toInt());
return static_cast<MusicStorage::TranscodeMode>(idx.data(DeviceManager::Role_TranscodeMode).toInt());
}
@ -162,7 +162,7 @@ Song::FileType ConnectedDevice::GetTranscodeFormat() const {
QModelIndex idx = manager_->ItemToIndex(info);
if (!idx.isValid()) return Song::FileType_Unknown;
return Song::FileType(idx.data(DeviceManager::Role_TranscodeFormat).toInt());
return static_cast<Song::FileType>(idx.data(DeviceManager::Role_TranscodeFormat).toInt());
}

4
src/device/devicedatabasebackend.cpp
View File

@ -95,8 +95,8 @@ DeviceDatabaseBackend::DeviceList DeviceDatabaseBackend::GetAllDevices() {
dev.size_ = q.value(3).toLongLong();
dev.icon_name_ = q.value(4).toString();
int schema_version = q.value(5).toInt();
dev.transcode_mode_ = MusicStorage::TranscodeMode(q.value(6).toInt());
dev.transcode_format_ = Song::FileType(q.value(7).toInt());
dev.transcode_mode_ = static_cast<MusicStorage::TranscodeMode>(q.value(6).toInt());
dev.transcode_format_ = static_cast<Song::FileType>(q.value(7).toInt());
if (schema_version < kDeviceSchemaVersion) { // Device is using old schema, drop it.
old_devices << dev;
}

6
src/device/deviceproperties.cpp
View File

@ -209,7 +209,7 @@ void DeviceProperties::UpdateFormats() {
std::shared_ptr<ConnectedDevice> device = manager_->GetConnectedDevice(index_);
// Transcode mode
MusicStorage::TranscodeMode mode = MusicStorage::TranscodeMode(index_.data(DeviceManager::Role_TranscodeMode).toInt());
MusicStorage::TranscodeMode mode = static_cast<MusicStorage::TranscodeMode>(index_.data(DeviceManager::Role_TranscodeMode).toInt());
switch (mode) {
case MusicStorage::Transcode_Always:
ui_->transcode_all->setChecked(true);
@ -273,7 +273,7 @@ void DeviceProperties::accept() {
mode = MusicStorage::Transcode_Unsupported;
// Transcode format
Song::FileType format = Song::FileType(ui_->transcode_format->itemData(ui_->transcode_format->currentIndex()).toInt());
Song::FileType format = static_cast<Song::FileType>(ui_->transcode_format->itemData(ui_->transcode_format->currentIndex()).toInt());
// By default no icon is selected and thus no current item is selected
QString icon_name;
@ -317,7 +317,7 @@ void DeviceProperties::UpdateFormatsFinished() {
#ifdef HAVE_GSTREAMER
// Set the format combobox item
TranscoderPreset preset = Transcoder::PresetForFileType(Song::FileType(index_.data(DeviceManager::Role_TranscodeFormat).toInt()));
TranscoderPreset preset = Transcoder::PresetForFileType(static_cast<Song::FileType>(index_.data(DeviceManager::Role_TranscodeFormat).toInt()));
if (preset.filetype_ == Song::FileType_Unknown) {
// The user hasn't chosen a format for this device yet,
// so work our way down a list of some preferred formats, picking the first one that is supported

4
src/device/mtpconnection.cpp
View File

@ -122,7 +122,7 @@ bool MtpConnection::GetSupportedFiletypes(QList<Song::FileType> *ret) {
}
for (int i = 0; i < length; ++i) {
switch (LIBMTP_filetype_t(list[i])) {
switch (static_cast<LIBMTP_filetype_t>(list[i])) {
case LIBMTP_FILETYPE_WAV: *ret << Song::FileType_WAV; break;
case LIBMTP_FILETYPE_MP2:
case LIBMTP_FILETYPE_MP3: *ret << Song::FileType_MPEG; break;
@ -140,7 +140,7 @@ bool MtpConnection::GetSupportedFiletypes(QList<Song::FileType> *ret) {
*ret << Song::FileType_OggFlac;
break;
default:
qLog(Error) << "Unknown MTP file format" << LIBMTP_Get_Filetype_Description(LIBMTP_filetype_t(list[i]));
qLog(Error) << "Unknown MTP file format" << LIBMTP_Get_Filetype_Description(static_cast<LIBMTP_filetype_t>(list[i]));
break;
}
}

4
src/device/mtpdevice.cpp
View File

@ -260,7 +260,7 @@ bool MtpDevice::GetSupportedFiletypes(QList<Song::FileType> *ret, LIBMTP_mtpdevi
}
for (int i = 0; i < length; ++i) {
switch (LIBMTP_filetype_t(list[i])) {
switch (static_cast<LIBMTP_filetype_t>(list[i])) {
case LIBMTP_FILETYPE_WAV: *ret << Song::FileType_WAV; break;
case LIBMTP_FILETYPE_MP2:
case LIBMTP_FILETYPE_MP3: *ret << Song::FileType_MPEG; break;
@ -278,7 +278,7 @@ bool MtpDevice::GetSupportedFiletypes(QList<Song::FileType> *ret, LIBMTP_mtpdevi
*ret << Song::FileType_OggFlac;
break;
default:
qLog(Error) << "Unknown MTP file format" << LIBMTP_Get_Filetype_Description(LIBMTP_filetype_t(list[i]));
qLog(Error) << "Unknown MTP file format" << LIBMTP_Get_Filetype_Description(static_cast<LIBMTP_filetype_t>(list[i]));
break;
}
}

2
src/engine/gstengine.cpp
View File

@ -353,7 +353,7 @@ qint64 GstEngine::position_nanosec() const {
if (!current_pipeline_) return 0;
const qint64 result = current_pipeline_->position() - static_cast<qint64>(beginning_nanosec_);
return qint64(qMax(0LL, result));
return std::max(0LL, result);
}

4
src/engine/gstenginepipeline.cpp
View File

@ -1443,12 +1443,12 @@ void GstEnginePipeline::StartFader(const qint64 duration_nanosec, const QTimeLin
}
else {
// Calculate the position in the new fader with the same value from the old fader, so no volume jumps appear
qreal time = qreal(duration_msec) * (qreal(fader_->currentTime()) / qreal(fader_->duration()));
qreal time = static_cast<qreal>(duration_msec) * (static_cast<qreal>(fader_->currentTime()) / static_cast<qreal>(fader_->duration()));
start_time = qRound(time);
}
}
fader_.reset(new QTimeLine(duration_msec), [](QTimeLine *timeline) {
fader_.reset(new QTimeLine(static_cast<int>(duration_msec)), [](QTimeLine *timeline) {
if (timeline->state() != QTimeLine::NotRunning) {
timeline->stop();
}

6
src/globalshortcuts/globalshortcut.cpp
View File

@ -41,7 +41,7 @@ QHash<QPair<quint32, quint32>, GlobalShortcut*> GlobalShortcut::internal_shortcu
GlobalShortcut::GlobalShortcut(QObject *parent)
: QObject(parent),
backend_(nullptr),
qt_key_(Qt::Key(0)),
qt_key_(static_cast<Qt::Key>(0)),
qt_mods_(Qt::NoModifier),
native_key_(0),
native_key2_(0),
@ -58,7 +58,7 @@ GlobalShortcut::GlobalShortcut(const QKeySequence &shortcut, GlobalShortcutsBack
: QObject(parent),
backend_(backend),
shortcut_(shortcut),
qt_key_(Qt::Key(0)),
qt_key_(static_cast<Qt::Key>(0)),
qt_mods_(Qt::NoModifier),
native_key_(0),
native_key2_(0),
@ -150,7 +150,7 @@ bool GlobalShortcut::unsetShortcut() {
qLog(Error) << "Failed to unregister shortcut" << shortcut_.toString();
}
qt_key_ = Qt::Key(0);
qt_key_ = static_cast<Qt::Key>(0);
qt_mods_ = Qt::KeyboardModifiers();
native_key_ = 0;
native_mods_ = 0;

1
src/internet/internetsearchmodel.cpp
View File

@ -395,6 +395,7 @@ MimeData *InternetSearchModel::LoadTracks(const InternetSearchView::ResultList &
SongList songs;
QList<QUrl> urls;
songs.reserve(results.count());
urls.reserve(results.count());
for (const InternetSearchView::Result &result : results) {
songs.append(result.metadata_);

4
src/internet/internetsearchview.cpp
View File

@ -248,7 +248,7 @@ void InternetSearchView::ReloadSettings() {
CollectionModel::GroupBy(s.value("search_group_by3", static_cast<int>(CollectionModel::GroupBy_None)).toInt())));
}
else {
SetGroupBy(CollectionModel::Grouping(CollectionModel::GroupBy(CollectionModel::GroupBy_AlbumArtist), CollectionModel::GroupBy(CollectionModel::GroupBy_AlbumDisc), CollectionModel::GroupBy(CollectionModel::GroupBy_None)));
SetGroupBy(CollectionModel::Grouping(CollectionModel::GroupBy_AlbumArtist, CollectionModel::GroupBy_AlbumDisc, CollectionModel::GroupBy_None));
}
s.endGroup();
@ -831,7 +831,7 @@ void InternetSearchView::LazyLoadAlbumCover(const QModelIndex &proxy_index) {
}
// Is this an album?
const CollectionModel::GroupBy container_type = CollectionModel::GroupBy(proxy_index.data(CollectionModel::Role_ContainerType).toInt());
const CollectionModel::GroupBy container_type = static_cast<CollectionModel::GroupBy>(proxy_index.data(CollectionModel::Role_ContainerType).toInt());
if (!CollectionModel::IsAlbumGroupBy(container_type)) return;
// Mark the item as loading art

4
src/moodbar/moodbarproxystyle.cpp
View File

@ -380,7 +380,7 @@ void MoodbarProxyStyle::ShowContextMenu(const QPoint pos) {
style_action_group_ = new QActionGroup(styles_menu);
for (int i = 0; i < MoodbarRenderer::StyleCount; ++i) {
const MoodbarRenderer::MoodbarStyle style = MoodbarRenderer::MoodbarStyle(i);
const MoodbarRenderer::MoodbarStyle style = static_cast<MoodbarRenderer::MoodbarStyle>(i);
QAction *action = style_action_group_->addAction(MoodbarRenderer::StyleName(style));
action->setCheckable(true);
@ -394,7 +394,7 @@ void MoodbarProxyStyle::ShowContextMenu(const QPoint pos) {
// Update the currently selected style
for (QAction *action : style_action_group_->actions()) {
if (MoodbarRenderer::MoodbarStyle(action->data().toInt()) == moodbar_style_) {
if (static_cast<MoodbarRenderer::MoodbarStyle>(action->data().toInt()) == moodbar_style_) {
action->setChecked(true);
break;
}

6
src/playlist/playlistbackend.cpp
View File

@ -136,7 +136,7 @@ PlaylistBackend::PlaylistList PlaylistBackend::GetPlaylists(const GetPlaylistsFl
p.special_type = q.value(3).toString();
p.ui_path = q.value(4).toString();
p.favorite = q.value(5).toBool();
p.dynamic_type = PlaylistGenerator::Type(q.value(6).toInt());
p.dynamic_type = static_cast<PlaylistGenerator::Type>(q.value(6).toInt());
p.dynamic_data = q.value(7).toByteArray();
p.dynamic_backend = q.value(8).toString();
ret << p;
@ -169,7 +169,7 @@ PlaylistBackend::Playlist PlaylistBackend::GetPlaylist(const int id) {
p.special_type = q.value(3).toString();
p.ui_path = q.value(4).toString();
p.favorite = q.value(5).toBool();
p.dynamic_type = PlaylistGenerator::Type(q.value(6).toInt());
p.dynamic_type = static_cast<PlaylistGenerator::Type>(q.value(6).toInt());
p.dynamic_data = q.value(7).toByteArray();
p.dynamic_backend = q.value(8).toString();
@ -253,7 +253,7 @@ PlaylistItemPtr PlaylistBackend::NewPlaylistItemFromQuery(const SqlRow &row, std
// The song tables get joined first, plus one each for the song ROWIDs
const int playlist_row = static_cast<int>(Song::kColumns.count() + 1) * kSongTableJoins;
PlaylistItemPtr item(PlaylistItem::NewFromSource(Song::Source(row.value(playlist_row).toInt())));
PlaylistItemPtr item(PlaylistItem::NewFromSource(static_cast<Song::Source>(row.value(playlist_row).toInt())));
if (item) {
item->InitFromQuery(row);
return RestoreCueData(item, state);

4
src/playlist/playlistdelegates.cpp
View File

@ -360,7 +360,7 @@ QString FileTypeItemDelegate::displayText(const QVariant &value, const QLocale &
Q_UNUSED(locale);
bool ok = false;
Song::FileType type = Song::FileType(value.toInt(&ok));
Song::FileType type = static_cast<Song::FileType>(value.toInt(&ok));
if (!ok) return tr("Unknown");
@ -500,7 +500,7 @@ void SongSourceDelegate::paint(QPainter *painter, const QStyleOptionViewItem &op
QStyleOptionViewItem option_copy(option);
initStyleOption(&option_copy, idx);
const Song::Source source = Song::Source(idx.data().toInt());
const Song::Source source = static_cast<Song::Source>(idx.data().toInt());
QPixmap pixmap = LookupPixmap(source, option_copy.decorationSize);
QWidget *parent_widget = qobject_cast<QWidget*>(parent());

4
src/playlist/playlistview.cpp
View File

@ -1056,7 +1056,7 @@ void PlaylistView::paintEvent(QPaintEvent *event) {
// Actually draw the background image
if (!cached_scaled_background_image_.isNull()) {
// Set opactiy only if needed, as this deactivate hardware acceleration
if (!qFuzzyCompare(previous_background_image_opacity_, qreal(0.0))) {
if (!qFuzzyCompare(previous_background_image_opacity_, static_cast<qreal>(0.0))) {
background_painter.setOpacity(1.0 - previous_background_image_opacity_);
}
switch (background_image_position_) {
@ -1524,7 +1524,7 @@ void PlaylistView::set_background_image(const QImage &image) {
void PlaylistView::FadePreviousBackgroundImage(const qreal value) {
previous_background_image_opacity_ = value;
if (qFuzzyCompare(previous_background_image_opacity_, qreal(0.0))) {
if (qFuzzyCompare(previous_background_image_opacity_, static_cast<qreal>(0.0))) {
previous_background_image_ = QPixmap();
previous_background_image_opacity_ = 0.0;
}

2
src/radios/radiobackend.cpp
View File

@ -107,7 +107,7 @@ void RadioBackend::GetChannels() {
RadioChannelList channels;
while (q.next()) {
RadioChannel channel;
channel.source = Song::Source(q.value(0).toInt());
channel.source = static_cast<Song::Source>(q.value(0).toInt());
channel.name = q.value(1).toString();
channel.url.setUrl(q.value(2).toString());
channel.thumbnail_url.setUrl(q.value(3).toString());

2
src/radios/radiomodel.cpp
View File

@ -270,7 +270,7 @@ QString RadioModel::ChannelIconPixmapCacheKey(const QModelIndex &idx) const {
}
QPixmap RadioModel::ServiceIcon(const QModelIndex &idx) const {
return Song::IconForSource(Song::Source(idx.data(Role_Source).toInt())).pixmap(kTreeIconSize, kTreeIconSize);
return Song::IconForSource(static_cast<Song::Source>(idx.data(Role_Source).toInt())).pixmap(kTreeIconSize, kTreeIconSize);
}
QPixmap RadioModel::ServiceIcon(RadioItem *item) const {

2
src/settings/appearancesettingspage.cpp
View File

@ -295,7 +295,7 @@ void AppearanceSettingsPage::Save() {
s.remove(kBackgroundImageFilename);
}
BackgroundImagePosition backgroundimageposition = BackgroundImagePosition(ui_->combobox_backgroundimageposition->itemData(ui_->combobox_backgroundimageposition->currentIndex()).toInt());
BackgroundImagePosition backgroundimageposition = static_cast<BackgroundImagePosition>(ui_->combobox_backgroundimageposition->itemData(ui_->combobox_backgroundimageposition->currentIndex()).toInt());
s.setValue(kBackgroundImageMaxSize, ui_->spinbox_background_image_maxsize->value());
s.setValue(kBackgroundImagePosition, backgroundimageposition);
s.setValue(kBackgroundImageStretch, ui_->checkbox_background_image_stretch->isChecked());

4
src/settings/backendsettingspage.cpp
View File

@ -137,8 +137,8 @@ void BackendSettingsPage::Load() {
ui_->lineedit_device->show();
ui_->widget_alsa_plugin->show();
int alsaplug_int = alsa_plugin(s.value("alsaplugin", 0).toInt());
if (alsa_plugin(alsaplug_int)) {
alsa_plugin alsaplugin = alsa_plugin(alsaplug_int);
if (static_cast<alsa_plugin>(alsaplug_int)) {
alsa_plugin alsaplugin = static_cast<alsa_plugin>(alsaplug_int);
switch (alsaplugin) {
case alsa_plugin::alsa_hw:
ui_->radiobutton_alsa_hw->setChecked(true);

10
src/settings/behavioursettingspage.cpp
View File

@ -253,14 +253,14 @@ void BehaviourSettingsPage::Save() {
s.setValue("language", language_map_.contains(ui_->combobox_language->currentText()) ? language_map_[ui_->combobox_language->currentText()] : QString());
PlayBehaviour menu_playmode = PlayBehaviour(ui_->combobox_menuplaymode->itemData(ui_->combobox_menuplaymode->currentIndex()).toInt());
PlayBehaviour menu_playmode = static_cast<PlayBehaviour>(ui_->combobox_menuplaymode->itemData(ui_->combobox_menuplaymode->currentIndex()).toInt());
PreviousBehaviour menu_previousmode = PreviousBehaviour(ui_->combobox_previousmode->itemData(ui_->combobox_previousmode->currentIndex()).toInt());
AddBehaviour doubleclick_addmode = AddBehaviour(ui_->combobox_doubleclickaddmode->itemData(ui_->combobox_doubleclickaddmode->currentIndex()).toInt());
PreviousBehaviour menu_previousmode = static_cast<PreviousBehaviour>(ui_->combobox_previousmode->itemData(ui_->combobox_previousmode->currentIndex()).toInt());
AddBehaviour doubleclick_addmode = static_cast<AddBehaviour>(ui_->combobox_doubleclickaddmode->itemData(ui_->combobox_doubleclickaddmode->currentIndex()).toInt());
PlayBehaviour doubleclick_playmode = PlayBehaviour(ui_->combobox_doubleclickplaymode->itemData(ui_->combobox_doubleclickplaymode->currentIndex()).toInt());
PlayBehaviour doubleclick_playmode = static_cast<PlayBehaviour>(ui_->combobox_doubleclickplaymode->itemData(ui_->combobox_doubleclickplaymode->currentIndex()).toInt());
PlaylistAddBehaviour doubleclick_playlist_addmode = PlaylistAddBehaviour(ui_->combobox_doubleclickplaylistaddmode->itemData(ui_->combobox_doubleclickplaylistaddmode->currentIndex()).toInt());
PlaylistAddBehaviour doubleclick_playlist_addmode = static_cast<PlaylistAddBehaviour>(ui_->combobox_doubleclickplaylistaddmode->itemData(ui_->combobox_doubleclickplaylistaddmode->currentIndex()).toInt());
s.setValue("menu_playmode", menu_playmode);
s.setValue("menu_previousmode", menu_previousmode);

2
src/settings/moodbarsettingspage.cpp
View File

@ -114,7 +114,7 @@ void MoodbarSettingsPage::InitMoodbarPreviews() {
// Render and set each preview
for (int i = 0; i < MoodbarRenderer::StyleCount; ++i) {
const MoodbarRenderer::MoodbarStyle style = MoodbarRenderer::MoodbarStyle(i);
const MoodbarRenderer::MoodbarStyle style = static_cast<MoodbarRenderer::MoodbarStyle>(i);
const ColorVector colors = MoodbarRenderer::Colors(file_data, style, palette());
QPixmap pixmap(preview_size);

2
src/settings/notificationssettingspage.cpp
View File

@ -264,7 +264,7 @@ void NotificationsSettingsPage::Save() {
void NotificationsSettingsPage::PrettyOpacityChanged(int value) {
pretty_popup_->set_background_opacity(qreal(value) / 100.0);
pretty_popup_->set_background_opacity(static_cast<qreal>(value) / 100.0);
set_changed();
}

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) {

2
src/transcoder/transcoder.cpp
View File

@ -185,7 +185,7 @@ GstElement *Transcoder::CreateElementForMimeType(const QString &element_type, co
}
Transcoder::JobFinishedEvent::JobFinishedEvent(JobState *state, bool success)
: QEvent(QEvent::Type(sEventType)), state_(state), success_(success) {}
: QEvent(static_cast<QEvent::Type>(sEventType)), state_(state), success_(success) {}
void Transcoder::JobState::PostFinished(const bool success) {

4
src/widgets/playingwidget.cpp
View File

@ -224,7 +224,7 @@ void PlayingWidget::CreateModeAction(const Mode mode, const QString &text, QActi
void PlayingWidget::SetMode(const int mode) {
mode_ = Mode(mode);
mode_ = static_cast<Mode>(mode);
fit_cover_width_action_->setEnabled(mode_ != SmallSongDetails);
@ -485,7 +485,7 @@ void PlayingWidget::FadePreviousTrack(const qreal value) {
if (!visible_) return;
pixmap_previous_track_opacity_ = value;
if (qFuzzyCompare(pixmap_previous_track_opacity_, qreal(0.0))) {
if (qFuzzyCompare(pixmap_previous_track_opacity_, static_cast<qreal>(0.0))) {
pixmap_previous_track_ = QPixmap();
}

10
src/widgets/stretchheaderview.cpp
View File

@ -196,7 +196,7 @@ void StretchHeaderView::SectionResized(const int logical, const int, const int n
if (in_mouse_move_event_) {
// Update this section's proportional width
column_widths_[logical] = ColumnWidthType(new_size) / width();
column_widths_[logical] = static_cast<ColumnWidthType>(new_size) / width();
// Find the visible sections to the right of the section that's being resized
int visual = visualIndex(logical);
@ -229,7 +229,7 @@ void StretchHeaderView::SetStretchEnabled(const bool enabled) {
// Initialize the list of widths from the current state of the widget
column_widths_.resize(count());
for (int i = 0; i < count(); ++i) {
column_widths_[i] = ColumnWidthType(sectionSize(i)) / width();
column_widths_[i] = static_cast<ColumnWidthType>(sectionSize(i)) / width();
}
// Stretch the columns to fill the widget
@ -282,7 +282,7 @@ bool StretchHeaderView::RestoreState(const QByteArray &sdata) {
s >> sort_indicator_order;
s >> sort_indicator_section;
setSortIndicator(sort_indicator_section, Qt::SortOrder(sort_indicator_order));
setSortIndicator(sort_indicator_section, static_cast<Qt::SortOrder>(sort_indicator_order));
const qint64 persisted_column_count = qMin(qMin(visual_indices.count(), pixel_widths.count()), column_widths_.count());
@ -336,7 +336,7 @@ QByteArray StretchHeaderView::SaveState() const {
s << pixel_widths;
s << visual_indices;
s << column_widths_;
s << int(sortIndicatorOrder());
s << static_cast<int>(sortIndicatorOrder());
s << sortIndicatorSection();
return ret;
@ -372,7 +372,7 @@ QByteArray StretchHeaderView::ResetState() {
s << pixel_widths;
s << visual_indices;
s << column_widths_;
s << int(Qt::AscendingOrder);
s << static_cast<int>(Qt::AscendingOrder);
s << 0;
RestoreState(ret);

2
src/widgets/volumeslider.cpp
View File

@ -221,7 +221,7 @@ VolumeSlider::VolumeSlider(QWidget *parent, const uint max)
anim_enter_(false),
anim_count_(0),
timer_anim_(new QTimer(this)),
pixmap_inset_(QPixmap(drawVolumePixmap())) {
pixmap_inset_(drawVolumePixmap()) {
setFocusPolicy(Qt::NoFocus);

1
tests/src/collectionbackend_test.cpp
View File

@ -401,6 +401,7 @@ TEST_F(TestUrls, TestUrls) {
QList<QUrl> urls = QUrl::fromStringList(strings);
SongList songs;
songs.reserve(urls.count());
for (const QUrl &url : urls) {
EXPECT_EQ(url, QUrl::fromEncoded(url.toString(QUrl::FullyEncoded).toUtf8()));