chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 10:40:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

enforce Errors For Warnings deprecated-copy deprecated-declarations stringop-overread

Browse Source
This commit is contained in:
LoudSnorer 2023-02-18 18:42:41 -05:00
parent e7c690925e
commit 651c612eda
5 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
oscar/SleepLib/appsettings.h
View File

@ -25,6 +25,7 @@ class Preferences;
enum OverviewLinechartModes { OLC_Bartop, OLC_Lines }; enum OverviewLinechartModes { OLC_Bartop, OLC_Lines };
#endif #endif
#define REMSTAR_M_SUPPORTdisabled
// ApplicationWideSettings Strings // ApplicationWideSettings Strings
const QString STR_CS_UserEventPieChart = "UserEventPieChart"; const QString STR_CS_UserEventPieChart = "UserEventPieChart";

6
oscar/SleepLib/loader_plugins/mseries_loader.cpp
View File

@ -7,11 +7,12 @@
* License. See the file COPYING in the main directory of the source code * License. See the file COPYING in the main directory of the source code
* for more details. */ * for more details. */
#include "mseries_loader.h"
#ifdef REMSTAR_M_SUPPORT
#include <QDir> #include <QDir>
#include <QProgressBar> #include <QProgressBar>
#include "mseries_loader.h"
// The qt5.15 obsolescence of hex requires this change. // The qt5.15 obsolescence of hex requires this change.
// this solution to QT's obsolescence is only used in debug statements // this solution to QT's obsolescence is only used in debug statements
#if QT_VERSION >= QT_VERSION_CHECK(5,15,0) #if QT_VERSION >= QT_VERSION_CHECK(5,15,0)
@ -499,3 +500,4 @@ void MSeriesLoader::Register()
//InitModelMap(); //InitModelMap();
mseries_initialized = true; mseries_initialized = true;
} }
#endif // REMSTAR_M_SUPPORT

4
oscar/SleepLib/loader_plugins/mseries_loader.h
View File

@ -13,6 +13,9 @@
#ifndef MSERIES_LOADER_H #ifndef MSERIES_LOADER_H
#define MSERIES_LOADER_H #define MSERIES_LOADER_H
#include "SleepLib/appsettings.h"
#ifdef REMSTAR_M_SUPPORT
#include "SleepLib/machine.h" #include "SleepLib/machine.h"
#include "SleepLib/machine_loader.h" #include "SleepLib/machine_loader.h"
#include "SleepLib/profiles.h" #include "SleepLib/profiles.h"
@ -74,4 +77,5 @@ class MSeriesLoader : public MachineLoader
quint32 epoch; quint32 epoch;
}; };
#endif // REMSTAR_M_SUPPORT
#endif // MSERIES_LOADER_H #endif // MSERIES_LOADER_H

1
oscar/mainwindow.cpp
View File

@ -42,6 +42,7 @@
#include "common_gui.h" #include "common_gui.h"
#include "version.h" #include "version.h"
#include "SleepLib/appsettings.h" // defines for REMSTAR_M_SUPPORT
// Custom loaders that don't autoscan.. // Custom loaders that don't autoscan..

23
oscar/oscar.pro
View File

@ -551,23 +551,26 @@ gcc | clang {
gcc:!clang { gcc:!clang {
message("Building for $$QMAKE_HOST.os") message("Building for $$QMAKE_HOST.os")
greaterThan(COMPILER_MAJOR, 10) : { # this section removedi. stringop-overread was only trigger by mseries_loader:: OPen method
QMAKE_CFLAGS += -Wno-error=stringop-overread #greaterThan(COMPILER_MAJOR, 10) : {
QMAKE_CXXFLAGS += -Wno-error=stringop-overread # QMAKE_CFLAGS += -Wno-error=stringop-overread
message("Making stringop-overread a non-error") # QMAKE_CXXFLAGS += -Wno-error=stringop-overread
} # message("Making stringop-overread a non-error")
#}
} }
clang { clang {
message("Building for $$QMAKE_HOST.os") message("Building for $$QMAKE_HOST.os")
greaterThan(COMPILER_MAJOR, 9) : { # this section removedi. all deprecated-copy errors have been removed
QMAKE_CFLAGS_WARN_ON += -Wno-error=deprecated-copy #greaterThan(COMPILER_MAJOR, 9) : {
QMAKE_CXXFLAGS_WARN_ON += -Wno-error=deprecated-copy # QMAKE_CFLAGS_WARN_ON += -Wno-error=deprecated-copy
message("Making deprecated-copy a non-error") # QMAKE_CXXFLAGS_WARN_ON += -Wno-error=deprecated-copy
} # message("Making deprecated-copy a non-error")
#}
} }
# Make deprecation warnings just warnings # Make deprecation warnings just warnings
# these two removed. all deprecated-declarations errors have been removed
QMAKE_CFLAGS += -Wno-error=deprecated-declarations QMAKE_CFLAGS += -Wno-error=deprecated-declarations
QMAKE_CXXFLAGS += -Wno-error=deprecated-declarations QMAKE_CXXFLAGS += -Wno-error=deprecated-declarations