From a1c55a5b02d86486dc8b54ab7cb864b22fd55e09 Mon Sep 17 00:00:00 2001 From: philmoz Date: Fri, 16 Dec 2022 11:24:28 +1100 Subject: [PATCH] chore: Cleanup some compiler warnings (#2864) --- companion/src/shared/curvedialog.cpp | 1 - companion/src/simulation/simulateduiwidgetX9D2019.cpp | 2 -- companion/src/simulation/simulateduiwidgetX9LITE.cpp | 2 -- companion/src/storage/yaml.h | 6 +++--- radio/src/gui/colorlcd/model_select.cpp | 2 ++ radio/src/gui/colorlcd/theme_manager.cpp | 3 +++ radio/src/storage/modelslist.h | 2 +- radio/src/strhelpers.cpp | 2 +- radio/src/telemetry/frsky_pxx2.cpp | 2 +- radio/src/telemetry/multi.cpp | 3 +++ 10 files changed, 14 insertions(+), 11 deletions(-) diff --git a/companion/src/shared/curvedialog.cpp b/companion/src/shared/curvedialog.cpp index baecf5118..485e85573 100644 --- a/companion/src/shared/curvedialog.cpp +++ b/companion/src/shared/curvedialog.cpp @@ -247,7 +247,6 @@ void CurveDialog::updateCurve() Node * nodel = 0; Node * nodex = 0; - QColor color; scene->clear(); diff --git a/companion/src/simulation/simulateduiwidgetX9D2019.cpp b/companion/src/simulation/simulateduiwidgetX9D2019.cpp index 414ba891b..c758e9185 100644 --- a/companion/src/simulation/simulateduiwidgetX9D2019.cpp +++ b/companion/src/simulation/simulateduiwidgetX9D2019.cpp @@ -33,8 +33,6 @@ SimulatedUIWidgetX9D2019::SimulatedUIWidgetX9D2019(SimulatorInterface *simulator // add actions in order of appearance on the help menu - QPoint ctr(70, 100); - act = new RadioUiAction(0, QList() << Qt::Key_Up << Qt::Key_PageUp, SIMU_STR_HLP_KEYS_GO_UP, SIMU_STR_HLP_ACT_MENU); addRadioWidget(ui->leftbuttons->addArea(QRect(25, 40, 80, 35), "X9D2019/left_menu.png", act)); diff --git a/companion/src/simulation/simulateduiwidgetX9LITE.cpp b/companion/src/simulation/simulateduiwidgetX9LITE.cpp index 6941a308d..1f10734d3 100644 --- a/companion/src/simulation/simulateduiwidgetX9LITE.cpp +++ b/companion/src/simulation/simulateduiwidgetX9LITE.cpp @@ -13,8 +13,6 @@ SimulatedUIWidgetX9LITE::SimulatedUIWidgetX9LITE(SimulatorInterface *simulator, // add actions in order of appearance on the help menu - QPoint ctr(70, 91); - act = new RadioUiAction(0, QList() << Qt::Key_PageUp << Qt::Key_Up, SIMU_STR_HLP_KEYS_GO_UP, SIMU_STR_HLP_ACT_MENU_ICN); addRadioWidget(ui->leftbuttons->addArea(QRect(80, 20, 40, 35), "X9LITE/left_menu.png", act)); diff --git a/companion/src/storage/yaml.h b/companion/src/storage/yaml.h index 281cf6321..f97c33798 100644 --- a/companion/src/storage/yaml.h +++ b/companion/src/storage/yaml.h @@ -34,9 +34,9 @@ class YamlFormat : public StorageFormat { } - virtual QString name() { return "yml"; } - virtual bool load(RadioData & radioData); - virtual bool write(const RadioData & radioData) { return false; } + virtual QString name() override { return "yml"; } + virtual bool load(RadioData & radioData) override; + virtual bool write(const RadioData & radioData) override { return false; } virtual bool writeModel(const RadioData & radioData, const int modelIndex) override; protected: diff --git a/radio/src/gui/colorlcd/model_select.cpp b/radio/src/gui/colorlcd/model_select.cpp index 1ad34e3c0..11bfa7ee2 100644 --- a/radio/src/gui/colorlcd/model_select.cpp +++ b/radio/src/gui/colorlcd/model_select.cpp @@ -176,6 +176,8 @@ class ButtonHolder : public FormWindow _buttons[1].sortState = 0; _buttons[1].button->setBitmap(_buttons[1].states[1]); break; + default: + break; } } diff --git a/radio/src/gui/colorlcd/theme_manager.cpp b/radio/src/gui/colorlcd/theme_manager.cpp index 0f1a2cff2..5d0fc04d9 100644 --- a/radio/src/gui/colorlcd/theme_manager.cpp +++ b/radio/src/gui/colorlcd/theme_manager.cpp @@ -178,6 +178,9 @@ void ThemeFile::deSerialize() info[INFO_LENGTH] = '\0'; } } break; + + default: + break; } } diff --git a/radio/src/storage/modelslist.h b/radio/src/storage/modelslist.h index 89909f57e..34235d405 100644 --- a/radio/src/storage/modelslist.h +++ b/radio/src/storage/modelslist.h @@ -258,7 +258,7 @@ class ModelsList : public ModelsVector bool isModelIdUnique(uint8_t moduleIdx, char *warn_buf, size_t warn_buf_len); uint8_t findNextUnusedModelId(uint8_t moduleIdx); - typedef struct { + typedef struct _filedat { std::string name; char hash[FILE_HASH_LENGTH + 1]; bool curmodel = false; diff --git a/radio/src/strhelpers.cpp b/radio/src/strhelpers.cpp index b3866dde2..9b344c3ea 100644 --- a/radio/src/strhelpers.cpp +++ b/radio/src/strhelpers.cpp @@ -625,7 +625,7 @@ char *getSourceString(char (&dest)[L], mixsrc_t idx) if (g_model.scriptsData[qr.quot].name[0] != '\0') { // instance Name is not empty : dest = InstanceName/OutputName - snprintf(pos, dest_len, "%.*s/%.*s", sizeof(g_model.scriptsData[qr.quot].name), g_model.scriptsData[qr.quot].name, + snprintf(pos, dest_len, "%.*s/%.*s", (int)sizeof(g_model.scriptsData[qr.quot].name), g_model.scriptsData[qr.quot].name, (int)sizeof(scriptInputsOutputs[qr.quot].outputs[qr.rem].name), scriptInputsOutputs[qr.quot].outputs[qr.rem].name); } else { // instance Name is empty : dest = n-ScriptFileName/OutputName diff --git a/radio/src/telemetry/frsky_pxx2.cpp b/radio/src/telemetry/frsky_pxx2.cpp index 91bf18d25..a17468a6f 100644 --- a/radio/src/telemetry/frsky_pxx2.cpp +++ b/radio/src/telemetry/frsky_pxx2.cpp @@ -29,7 +29,7 @@ #include "intmodule_serial_driver.h" #endif -static_assert(PXX2_FRAME_MAXLENGTH <= INTMODULE_FIFO_SIZE); +static_assert(PXX2_FRAME_MAXLENGTH <= INTMODULE_FIFO_SIZE, ""); static void processGetHardwareInfoFrame(uint8_t module, const uint8_t * frame) { diff --git a/radio/src/telemetry/multi.cpp b/radio/src/telemetry/multi.cpp index 82b15bf2c..f2e4b0e39 100644 --- a/radio/src/telemetry/multi.cpp +++ b/radio/src/telemetry/multi.cpp @@ -720,6 +720,9 @@ void processMultiTelemetryData(uint8_t data, uint8_t module) setMultiTelemetryBufferState(module, NoProtocolDetected); } break; + + default: + break; } }