From d898581ca4aff2fa00b99e9e275a8aa506594c87 Mon Sep 17 00:00:00 2001 From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com> Date: Wed, 15 Jan 2020 16:34:28 -0500 Subject: [PATCH] Remove version.h dependency from appsettings.h to reduce unnecessary recompiling. --- oscar/SleepLib/appsettings.cpp | 59 ++++++++++++++++++++++++++++++++++ oscar/SleepLib/appsettings.h | 52 ++---------------------------- oscar/SleepLib/profiles.cpp | 3 +- oscar/SleepLib/session.cpp | 4 ++- oscar/main.cpp | 3 ++ oscar/newprofile.cpp | 2 ++ oscar/oscar.pro | 1 + oscar/profileselector.cpp | 1 + oscar/reports.cpp | 3 +- oscar/statistics.cpp | 3 +- oscar/tests/prs1tests.cpp | 2 -- oscar/tests/resmedtests.cpp | 2 -- 12 files changed, 78 insertions(+), 57 deletions(-) create mode 100644 oscar/SleepLib/appsettings.cpp diff --git a/oscar/SleepLib/appsettings.cpp b/oscar/SleepLib/appsettings.cpp new file mode 100644 index 00000000..1b6cc0a9 --- /dev/null +++ b/oscar/SleepLib/appsettings.cpp @@ -0,0 +1,59 @@ +/* SleepLib AppSettings Initialization + * + * This isolates the initialization and its dependencies from the header file, + * which is widely included. + * + * Copyright (c) 2020 The OSCAR Team + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file COPYING in the main directory of the sourcecode. */ + +#include "appsettings.h" +#include "version.h" + +AppWideSetting::AppWideSetting(Preferences *pref) : PrefSettings(pref) +{ +// m_multithreading = initPref(STR_IS_Multithreading, idealThreads() > 1).toBool(); + m_multithreading = false; // too dangerous to allow + m_showPerformance = initPref(STR_US_ShowPerformance, false).toBool(); + m_showDebug = initPref(STR_US_ShowDebug, false).toBool(); + initPref(STR_AS_CalendarVisible, false); + m_scrollDampening = initPref(STR_US_ScrollDampening, (int)50).toInt(); + m_tooltipTimeout = initPref(STR_US_TooltipTimeout, (int)2500).toInt(); + m_graphHeight=initPref(STR_AS_GraphHeight, 180).toInt(); + initPref(STR_AS_DailyPanelWidth, 250.0); + initPref(STR_AS_RightPanelWidth, 230.0); + m_antiAliasing=initPref(STR_AS_AntiAliasing, true).toBool(); +// initPref(STR_AS_GraphSnapshots, true); + initPref(STR_AS_IncludeSerial, false); + initPref(STR_AS_ShowPieChart, false); + m_animations = initPref(STR_AS_Animations, true).toBool(); + m_squareWavePlots = initPref(STR_AS_SquareWave, false).toBool(); + initPref(STR_AS_AllowYAxisScaling, true); + m_graphTooltips = initPref(STR_AS_GraphTooltips, true).toBool(); + m_usePixmapCaching = initPref(STR_AS_UsePixmapCaching, false).toBool(); + m_odt = (OverlayDisplayType)initPref(STR_AS_OverlayType, (int)ODT_Bars).toInt(); + m_olm = (OverviewLinechartModes)initPref(STR_AS_OverviewLinechartMode, (int)OLC_Bartop).toInt(); + m_lineThickness=initPref(STR_AS_LineThickness, 1.0).toFloat(); + m_lineCursorMode = initPref(STR_AS_LineCursorMode, true).toBool(); + initPref(STR_AS_RightSidebarVisible, false); + initPref(STR_CS_UserEventPieChart, false); + initPref(STR_US_ShowSerialNumbers, false); + initPref(STR_US_OpenTabAtStart, 1); + initPref(STR_US_OpenTabAfterImport, 0); + initPref(STR_US_AutoLaunchImport, false); + m_cacheSessions = initPref(STR_IS_CacheSessions, false).toBool(); + initPref(STR_US_RemoveCardReminder, true); + m_profileName = initPref(STR_GEN_Profile, "").toString(); + initPref(STR_GEN_AutoOpenLastUsed, true); + +#ifndef NO_UPDATER + initPref(STR_GEN_UpdatesAutoCheck, true); + initPref(STR_GEN_UpdateCheckFrequency, 7); + initPref(STR_PREF_AllowEarlyUpdates, false); + initPref(STR_GEN_UpdatesLastChecked, QDateTime()); +#endif + initPref(STR_PREF_VersionString, VersionString); + m_language = initPref(STR_GEN_Language, "en_US").toString(); + initPref(STR_GEN_ShowAboutDialog, 0); // default to about screen, set to -1 afterwards +} diff --git a/oscar/SleepLib/appsettings.h b/oscar/SleepLib/appsettings.h index 9ba292d4..513bbfbd 100644 --- a/oscar/SleepLib/appsettings.h +++ b/oscar/SleepLib/appsettings.h @@ -1,7 +1,8 @@ -/* SleepLib AppSettings Header +/* SleepLib AppSettings Header * * This file for all settings related stuff to clean up Preferences & Profiles. * + * Copyright (c) 2020 The OSCAR Team * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public @@ -13,7 +14,6 @@ #include #include "preferences.h" #include "common.h" -#include "version.h" class Preferences; @@ -68,53 +68,7 @@ const QString STR_PREF_AllowEarlyUpdates = "AllowEarlyUpdates"; class AppWideSetting: public PrefSettings { public: - AppWideSetting(Preferences *pref) - : PrefSettings(pref) - { -// m_multithreading = initPref(STR_IS_Multithreading, idealThreads() > 1).toBool(); - m_multithreading = false; // too dangerous to allow - m_showPerformance = initPref(STR_US_ShowPerformance, false).toBool(); - m_showDebug = initPref(STR_US_ShowDebug, false).toBool(); - initPref(STR_AS_CalendarVisible, false); - m_scrollDampening = initPref(STR_US_ScrollDampening, (int)50).toInt(); - m_tooltipTimeout = initPref(STR_US_TooltipTimeout, (int)2500).toInt(); - m_graphHeight=initPref(STR_AS_GraphHeight, 180).toInt(); - initPref(STR_AS_DailyPanelWidth, 250.0); - initPref(STR_AS_RightPanelWidth, 230.0); - m_antiAliasing=initPref(STR_AS_AntiAliasing, true).toBool(); -// initPref(STR_AS_GraphSnapshots, true); - initPref(STR_AS_IncludeSerial, false); - initPref(STR_AS_ShowPieChart, false); - m_animations = initPref(STR_AS_Animations, true).toBool(); - m_squareWavePlots = initPref(STR_AS_SquareWave, false).toBool(); - initPref(STR_AS_AllowYAxisScaling, true); - m_graphTooltips = initPref(STR_AS_GraphTooltips, true).toBool(); - m_usePixmapCaching = initPref(STR_AS_UsePixmapCaching, false).toBool(); - m_odt = (OverlayDisplayType)initPref(STR_AS_OverlayType, (int)ODT_Bars).toInt(); - m_olm = (OverviewLinechartModes)initPref(STR_AS_OverviewLinechartMode, (int)OLC_Bartop).toInt(); - m_lineThickness=initPref(STR_AS_LineThickness, 1.0).toFloat(); - m_lineCursorMode = initPref(STR_AS_LineCursorMode, true).toBool(); - initPref(STR_AS_RightSidebarVisible, false); - initPref(STR_CS_UserEventPieChart, false); - initPref(STR_US_ShowSerialNumbers, false); - initPref(STR_US_OpenTabAtStart, 1); - initPref(STR_US_OpenTabAfterImport, 0); - initPref(STR_US_AutoLaunchImport, false); - m_cacheSessions = initPref(STR_IS_CacheSessions, false).toBool(); - initPref(STR_US_RemoveCardReminder, true); - m_profileName = initPref(STR_GEN_Profile, "").toString(); - initPref(STR_GEN_AutoOpenLastUsed, true); - -#ifndef NO_UPDATER - initPref(STR_GEN_UpdatesAutoCheck, true); - initPref(STR_GEN_UpdateCheckFrequency, 7); - initPref(STR_PREF_AllowEarlyUpdates, false); - initPref(STR_GEN_UpdatesLastChecked, QDateTime()); -#endif - initPref(STR_PREF_VersionString, VersionString); - m_language = initPref(STR_GEN_Language, "en_US").toString(); - initPref(STR_GEN_ShowAboutDialog, 0); // default to about screen, set to -1 afterwards - } + AppWideSetting(Preferences *pref); bool m_usePixmapCaching, m_antiAliasing, m_squareWavePlots,m_graphTooltips, m_lineCursorMode, m_animations; bool m_showPerformance, m_showDebug; diff --git a/oscar/SleepLib/profiles.cpp b/oscar/SleepLib/profiles.cpp index d2f61b91..3f2ad827 100644 --- a/oscar/SleepLib/profiles.cpp +++ b/oscar/SleepLib/profiles.cpp @@ -1,6 +1,6 @@ /* SleepLib Profiles Implementation * - * Copyright (c) 2019 The OSCAR Team + * Copyright (c) 2019-2020 The OSCAR Team * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public @@ -29,6 +29,7 @@ #include "mainwindow.h" #include "translation.h" +#include "version.h" extern MainWindow *mainwin; Preferences *p_pref; diff --git a/oscar/SleepLib/session.cpp b/oscar/SleepLib/session.cpp index a7f099b1..6226913a 100644 --- a/oscar/SleepLib/session.cpp +++ b/oscar/SleepLib/session.cpp @@ -1,6 +1,7 @@ -/* SleepLib Session Implementation +/* SleepLib Session Implementation * This stuff contains the base calculation smarts * + * Copyright (c) 2019-2020 The OSCAR Team * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public @@ -8,6 +9,7 @@ * for more details. */ #include "session.h" +#include "version.h" #include #include #include diff --git a/oscar/main.cpp b/oscar/main.cpp index 6be306fc..a99ca598 100644 --- a/oscar/main.cpp +++ b/oscar/main.cpp @@ -245,6 +245,9 @@ bool migrateFromSH(QString destDir) { int main(int argc, char* argv[]) { + initializeStrings(); + qDebug() << STR_TR_OSCAR + " " + getBranchVersion(); + AutoTest::run(argc, argv); } diff --git a/oscar/newprofile.cpp b/oscar/newprofile.cpp index e83794a0..39b14b23 100644 --- a/oscar/newprofile.cpp +++ b/oscar/newprofile.cpp @@ -1,5 +1,6 @@ /* Create New Profile Implementation * + * Copyright (c) 2019-2020 The OSCAR Team * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public @@ -19,6 +20,7 @@ #include "newprofile.h" #include "ui_newprofile.h" #include "mainwindow.h" +#include "version.h" extern MainWindow *mainwin; diff --git a/oscar/oscar.pro b/oscar/oscar.pro index 9d316bdd..55c3aaf8 100644 --- a/oscar/oscar.pro +++ b/oscar/oscar.pro @@ -304,6 +304,7 @@ SOURCES += \ SleepLib/progressdialog.cpp \ SleepLib/loader_plugins/cms50f37_loader.cpp \ profileselector.cpp \ + SleepLib/appsettings.cpp \ SleepLib/loader_plugins/edfparser.cpp \ aboutdialog.cpp \ welcome.cpp diff --git a/oscar/profileselector.cpp b/oscar/profileselector.cpp index a6f5f92b..ab9f68ec 100644 --- a/oscar/profileselector.cpp +++ b/oscar/profileselector.cpp @@ -19,6 +19,7 @@ #include "statistics.h" #include "mainwindow.h" #include "newprofile.h" +#include "version.h" extern MainWindow * mainwin; diff --git a/oscar/reports.cpp b/oscar/reports.cpp index 6992bc3e..1c685b06 100644 --- a/oscar/reports.cpp +++ b/oscar/reports.cpp @@ -1,6 +1,6 @@ /* Reports/Printing Module * - * Copyright (c) 2019 The OSCAR Team + * Copyright (c) 2019-2020 The OSCAR Team * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public @@ -18,6 +18,7 @@ #include "mainwindow.h" #include "common_gui.h" #include "SleepLib/progressdialog.h" +#include "version.h" extern MainWindow *mainwin; diff --git a/oscar/statistics.cpp b/oscar/statistics.cpp index 275bd4d3..ba575195 100644 --- a/oscar/statistics.cpp +++ b/oscar/statistics.cpp @@ -1,6 +1,6 @@ /* Statistics Report Generator Implementation * - * Copyright (c) 2019 The OSCAR Team + * Copyright (c) 2019-2020 The OSCAR Team * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public @@ -22,6 +22,7 @@ #include "statistics.h" #include "cprogressbar.h" #include "SleepLib/common.h" +#include "version.h" extern MainWindow *mainwin; diff --git a/oscar/tests/prs1tests.cpp b/oscar/tests/prs1tests.cpp index 25900564..db541266 100644 --- a/oscar/tests/prs1tests.cpp +++ b/oscar/tests/prs1tests.cpp @@ -18,8 +18,6 @@ static QString prs1OutputPath(const QString & inpath, const QString & serial, in void PRS1Tests::initTestCase(void) { - initializeStrings(); - qDebug() << STR_TR_OSCAR + " " + getBranchVersion(); QString profile_path = TESTDATA_PATH "profile/"; Profiles::Create("test", &profile_path); diff --git a/oscar/tests/resmedtests.cpp b/oscar/tests/resmedtests.cpp index 9be70c02..fb2b5468 100644 --- a/oscar/tests/resmedtests.cpp +++ b/oscar/tests/resmedtests.cpp @@ -16,8 +16,6 @@ static void iterateTestCards(const QString & root, void (*action)(const QString void ResmedTests::initTestCase(void) { - initializeStrings(); - qDebug() << STR_TR_OSCAR + " " + getBranchVersion(); QString profile_path = TESTDATA_PATH "profile/"; Profiles::Create("test", &profile_path); p_pref = new Preferences("Preferences");