From 87546d2ce6457f0b6cc5bace532122bd6fb5875c Mon Sep 17 00:00:00 2001 From: ts-korhonen Date: Mon, 7 Mar 2022 21:47:48 +0200 Subject: [PATCH 1/3] qt: fix multiple compiler warnings --- src/qt/qt_newfloppydialog.cpp | 5 +++++ src/qt/qt_platform.cpp | 10 ++++++---- src/qt/qt_settings_bus_tracking.cpp | 2 +- src/qt/qt_settingsinput.cpp | 1 - src/qt/qt_settingsnetwork.cpp | 1 - src/qt/qt_settingsstoragecontrollers.cpp | 1 - 6 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/qt/qt_newfloppydialog.cpp b/src/qt/qt_newfloppydialog.cpp index 6eb43c960..58239fe16 100644 --- a/src/qt/qt_newfloppydialog.cpp +++ b/src/qt/qt_newfloppydialog.cpp @@ -339,6 +339,11 @@ bool NewFloppyDialog::create86f(const QString& filename, const disk_size_t& disk return true; } +/* Ignore false positive warning caused by a bug on gcc */ +#ifdef __GNUC__ +#pragma GCC diagnostic ignored "-Wstringop-overflow" +#endif + bool NewFloppyDialog::createSectorImage(const QString &filename, const disk_size_t& disk_size, FileType type) { uint32_t total_size = 0; diff --git a/src/qt/qt_platform.cpp b/src/qt/qt_platform.cpp index 0c399cd48..855e8a04c 100644 --- a/src/qt/qt_platform.cpp +++ b/src/qt/qt_platform.cpp @@ -74,11 +74,13 @@ private: extern "C" { #ifdef Q_OS_WINDOWS -#define NOMINMAX -#include -#include <86box/win.h> +# ifndef NOMINMAX +# define NOMINMAX +# endif +# include +# include <86box/win.h> #else -#include +# include #endif #include <86box/86box.h> #include <86box/device.h> diff --git a/src/qt/qt_settings_bus_tracking.cpp b/src/qt/qt_settings_bus_tracking.cpp index 41c7990da..b9b70bae1 100644 --- a/src/qt/qt_settings_bus_tracking.cpp +++ b/src/qt/qt_settings_bus_tracking.cpp @@ -218,7 +218,7 @@ SettingsBusTracking::scsi_bus_full() void SettingsBusTracking::device_track(int set, uint8_t dev_type, int bus, int channel) { - int i, element; + int element; uint64_t mask; uint8_t count = 0; diff --git a/src/qt/qt_settingsinput.cpp b/src/qt/qt_settingsinput.cpp index 7408db5d4..d5a62534f 100644 --- a/src/qt/qt_settingsinput.cpp +++ b/src/qt/qt_settingsinput.cpp @@ -54,7 +54,6 @@ void SettingsInput::onCurrentMachineChanged(int machineId) { // win_settings_video_proc, WM_INITDIALOG this->machineId = machineId; - const auto* machine = &machines[machineId]; auto* mouseModel = ui->comboBoxMouse->model(); auto removeRows = mouseModel->rowCount(); diff --git a/src/qt/qt_settingsnetwork.cpp b/src/qt/qt_settingsnetwork.cpp index 437ed3647..ec5ebbe53 100644 --- a/src/qt/qt_settingsnetwork.cpp +++ b/src/qt/qt_settingsnetwork.cpp @@ -80,7 +80,6 @@ void SettingsNetwork::save() { void SettingsNetwork::onCurrentMachineChanged(int machineId) { this->machineId = machineId; - auto* machine = &machines[machineId]; auto* model = ui->comboBoxAdapter->model(); auto removeRows = model->rowCount(); diff --git a/src/qt/qt_settingsstoragecontrollers.cpp b/src/qt/qt_settingsstoragecontrollers.cpp index 2427b5774..114654340 100644 --- a/src/qt/qt_settingsstoragecontrollers.cpp +++ b/src/qt/qt_settingsstoragecontrollers.cpp @@ -64,7 +64,6 @@ void SettingsStorageControllers::save() { void SettingsStorageControllers::onCurrentMachineChanged(int machineId) { this->machineId = machineId; - auto* machine = &machines[machineId]; /*HD controller config*/ auto* model = ui->comboBoxHD->model(); From c6b347000ee1d3202943305bb9f799343bb09fb8 Mon Sep 17 00:00:00 2001 From: ts-korhonen Date: Mon, 7 Mar 2022 22:10:03 +0200 Subject: [PATCH 2/3] qt: only ignore -Wstringop-overflow on gcc 11 --- src/qt/qt_newfloppydialog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qt/qt_newfloppydialog.cpp b/src/qt/qt_newfloppydialog.cpp index 58239fe16..30b0fb674 100644 --- a/src/qt/qt_newfloppydialog.cpp +++ b/src/qt/qt_newfloppydialog.cpp @@ -340,7 +340,7 @@ bool NewFloppyDialog::create86f(const QString& filename, const disk_size_t& disk } /* Ignore false positive warning caused by a bug on gcc */ -#ifdef __GNUC__ +#if __GNUC__ >= 11 #pragma GCC diagnostic ignored "-Wstringop-overflow" #endif From e0a23adbb4a7cf9ed66e99dbf5672a341fe2e96a Mon Sep 17 00:00:00 2001 From: ts-korhonen Date: Mon, 7 Mar 2022 22:25:15 +0200 Subject: [PATCH 3/3] qt: remove unused variables --- src/qt/qt_machinestatus.cpp | 14 +++++++------- src/qt/qt_settings_bus_tracking.cpp | 1 - 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/qt/qt_machinestatus.cpp b/src/qt/qt_machinestatus.cpp index ea83b630b..75062aede 100644 --- a/src/qt/qt_machinestatus.cpp +++ b/src/qt/qt_machinestatus.cpp @@ -358,7 +358,7 @@ void MachineStatus::refresh(QStatusBar* sbar) { if (cassette_enable) { d->cassette.label = std::make_unique(); d->cassette.setEmpty(QString(cassette_fname).isEmpty()); - connect((ClickableLabel*)d->cassette.label.get(), &ClickableLabel::clicked, [this](QPoint pos) { + connect((ClickableLabel*)d->cassette.label.get(), &ClickableLabel::clicked, [](QPoint pos) { MediaMenu::ptr->cassetteMenu->popup(pos - QPoint(0, MediaMenu::ptr->cassetteMenu->sizeHint().height())); }); d->cassette.label->setToolTip(MediaMenu::ptr->cassetteMenu->title()); @@ -369,7 +369,7 @@ void MachineStatus::refresh(QStatusBar* sbar) { for (int i = 0; i < 2; ++i) { d->cartridge[i].label = std::make_unique(); d->cartridge[i].setEmpty(QString(cart_fns[i]).isEmpty()); - connect((ClickableLabel*)d->cartridge[i].label.get(), &ClickableLabel::clicked, [this, i](QPoint pos) { + connect((ClickableLabel*)d->cartridge[i].label.get(), &ClickableLabel::clicked, [i](QPoint pos) { MediaMenu::ptr->cartridgeMenus[i]->popup(pos - QPoint(0, MediaMenu::ptr->cartridgeMenus[i]->sizeHint().height())); }); d->cartridge[i].label->setToolTip(MediaMenu::ptr->cartridgeMenus[i]->title()); @@ -389,7 +389,7 @@ void MachineStatus::refresh(QStatusBar* sbar) { d->fdd[i].label = std::make_unique(); d->fdd[i].setEmpty(QString(floppyfns[i]).isEmpty()); d->fdd[i].setActive(false); - connect((ClickableLabel*)d->fdd[i].label.get(), &ClickableLabel::clicked, [this, i](QPoint pos) { + connect((ClickableLabel*)d->fdd[i].label.get(), &ClickableLabel::clicked, [i](QPoint pos) { MediaMenu::ptr->floppyMenus[i]->popup(pos - QPoint(0, MediaMenu::ptr->floppyMenus[i]->sizeHint().height())); }); d->fdd[i].label->setToolTip(MediaMenu::ptr->floppyMenus[i]->title()); @@ -400,7 +400,7 @@ void MachineStatus::refresh(QStatusBar* sbar) { d->cdrom[i].label = std::make_unique(); d->cdrom[i].setEmpty(cdrom[i].host_drive != 200 || QString(cdrom[i].image_path).isEmpty()); d->cdrom[i].setActive(false); - connect((ClickableLabel*)d->cdrom[i].label.get(), &ClickableLabel::clicked, [this, i](QPoint pos) { + connect((ClickableLabel*)d->cdrom[i].label.get(), &ClickableLabel::clicked, [i](QPoint pos) { MediaMenu::ptr->cdromMenus[i]->popup(pos - QPoint(0, MediaMenu::ptr->cdromMenus[i]->sizeHint().height())); }); d->cdrom[i].label->setToolTip(MediaMenu::ptr->cdromMenus[i]->title()); @@ -411,7 +411,7 @@ void MachineStatus::refresh(QStatusBar* sbar) { d->zip[i].label = std::make_unique(); d->zip[i].setEmpty(QString(zip_drives[i].image_path).isEmpty()); d->zip[i].setActive(false); - connect((ClickableLabel*)d->zip[i].label.get(), &ClickableLabel::clicked, [this, i](QPoint pos) { + connect((ClickableLabel*)d->zip[i].label.get(), &ClickableLabel::clicked, [i](QPoint pos) { MediaMenu::ptr->zipMenus[i]->popup(pos - QPoint(0, MediaMenu::ptr->zipMenus[i]->sizeHint().height())); }); d->zip[i].label->setToolTip(MediaMenu::ptr->zipMenus[i]->title()); @@ -422,7 +422,7 @@ void MachineStatus::refresh(QStatusBar* sbar) { d->mo[i].label = std::make_unique(); d->mo[i].setEmpty(QString(mo_drives[i].image_path).isEmpty()); d->mo[i].setActive(false); - connect((ClickableLabel*)d->mo[i].label.get(), &ClickableLabel::clicked, [this, i](QPoint pos) { + connect((ClickableLabel*)d->mo[i].label.get(), &ClickableLabel::clicked, [i](QPoint pos) { MediaMenu::ptr->moMenus[i]->popup(pos - QPoint(0, MediaMenu::ptr->moMenus[i]->sizeHint().height())); }); d->mo[i].label->setToolTip(MediaMenu::ptr->moMenus[i]->title()); @@ -471,7 +471,7 @@ void MachineStatus::refresh(QStatusBar* sbar) { d->sound = std::make_unique(); d->sound->setPixmap(d->pixmaps.sound); - connect(d->sound.get(), &ClickableLabel::doubleClicked, d->sound.get(), [this](QPoint pos) { + connect(d->sound.get(), &ClickableLabel::doubleClicked, d->sound.get(), [](QPoint pos) { SoundGain gain(main_window); gain.exec(); }); diff --git a/src/qt/qt_settings_bus_tracking.cpp b/src/qt/qt_settings_bus_tracking.cpp index b9b70bae1..a1d8e3369 100644 --- a/src/qt/qt_settings_bus_tracking.cpp +++ b/src/qt/qt_settings_bus_tracking.cpp @@ -220,7 +220,6 @@ SettingsBusTracking::device_track(int set, uint8_t dev_type, int bus, int channe { int element; uint64_t mask; - uint8_t count = 0; switch (bus) { case HDD_BUS_MFM: