diff --git a/oscar/Graphs/gSessionTimesChart.cpp b/oscar/Graphs/gSessionTimesChart.cpp index 579614b9..d3a38cf9 100644 --- a/oscar/Graphs/gSessionTimesChart.cpp +++ b/oscar/Graphs/gSessionTimesChart.cpp @@ -1142,7 +1142,8 @@ void gAHIChart::customCalc(Day *day, QVector &list) case 1: calc->wavg_sum += value; calc->divisor += hours; - default: + break; + case 2: calc->avg_sum += value; calc->cnt++; break; diff --git a/oscar/SleepLib/common.cpp b/oscar/SleepLib/common.cpp index 65769d0b..1069ea22 100644 --- a/oscar/SleepLib/common.cpp +++ b/oscar/SleepLib/common.cpp @@ -802,7 +802,8 @@ QByteArray gUncompress(const QByteArray & data) switch (ret) { case Z_NEED_DICT: - ret = Z_DATA_ERROR; // and fall through + ret = Z_DATA_ERROR; + // fall through case Z_DATA_ERROR: case Z_MEM_ERROR: Q_UNUSED(ret) diff --git a/oscar/daily.cpp b/oscar/daily.cpp index 480a1a10..0d4cb1ae 100644 --- a/oscar/daily.cpp +++ b/oscar/daily.cpp @@ -2350,10 +2350,10 @@ void Daily::updateCube() } -void Daily::on_toggleGraphs_clicked(bool checked) +void Daily::on_toggleGraphs_clicked(bool /*checked*/) { QString s; - QIcon *icon=checked ? icon_off : icon_on; + //QIcon *icon=checked ? icon_off : icon_on; if (ui->graphCombo == nullptr ) qDebug() << "ToggleGraphs clicked with null graphCombo ptr"; else @@ -2414,10 +2414,10 @@ void Daily::on_eventsCombo_activated(int index) GraphView->redraw(); } -void Daily::on_toggleEvents_clicked(bool checked) +void Daily::on_toggleEvents_clicked(bool /*checked*/) { QString s; - QIcon *icon=checked ? icon_on : icon_off; + //QIcon *icon=checked ? icon_on : icon_off; if (ui->toggleEvents == nullptr ) qDebug() << "ToggleEvents clicked with null toggleEvents ptr"; diff --git a/oscar/oscar.pro b/oscar/oscar.pro index a4476e5c..a6410d1f 100644 --- a/oscar/oscar.pro +++ b/oscar/oscar.pro @@ -443,8 +443,8 @@ test { CONFIG += console debug CONFIG -= app_bundle !win32 { # add memory checking on Linux and macOS test builds - QMAKE_CFLAGS += -fsanitize=address -fno-omit-frame-pointer -fno-common -fsanitize-address-use-after-scope - QMAKE_CXXFLAGS += -fsanitize=address -fno-omit-frame-pointer -fno-common -fsanitize-address-use-after-scope + QMAKE_CFLAGS += -Werror -fsanitize=address -fno-omit-frame-pointer -fno-common -fsanitize-address-use-after-scope + QMAKE_CXXFLAGS += -Werror -fsanitize=address -fno-omit-frame-pointer -fno-common -fsanitize-address-use-after-scope QMAKE_LFLAGS += -fsanitize=address }