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

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;
}
}