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

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