From 97b5b6f4cac20acf2f722694776d011bb30bb98d Mon Sep 17 00:00:00 2001 From: AdenKoperczak Date: Thu, 19 Sep 2024 11:34:41 -0400 Subject: [PATCH] moved settings initialization into cpp files --- scwx-qt/source/scwx/qt/settings/settings_container.cpp | 4 +++- scwx-qt/source/scwx/qt/settings/settings_interface.cpp | 10 +++++++++- scwx-qt/source/scwx/qt/settings/settings_variable.cpp | 10 +++++++++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/scwx-qt/source/scwx/qt/settings/settings_container.cpp b/scwx-qt/source/scwx/qt/settings/settings_container.cpp index 1eb5b06a..f16af980 100644 --- a/scwx-qt/source/scwx/qt/settings/settings_container.cpp +++ b/scwx-qt/source/scwx/qt/settings/settings_container.cpp @@ -1,4 +1,4 @@ -#define SETTINGS_CONTAINER_IMPLEMENTATION +//#define SETTINGS_CONTAINER_IMPLEMENTATION #include #include @@ -172,6 +172,8 @@ bool SettingsContainer::Equals(const SettingsVariableBase& o) const p->elementMaximum_ == v.p->elementMaximum_; } +template class SettingsContainer>; + } // namespace settings } // namespace qt } // namespace scwx diff --git a/scwx-qt/source/scwx/qt/settings/settings_interface.cpp b/scwx-qt/source/scwx/qt/settings/settings_interface.cpp index 9a24c5ae..fc6d46ce 100644 --- a/scwx-qt/source/scwx/qt/settings/settings_interface.cpp +++ b/scwx-qt/source/scwx/qt/settings/settings_interface.cpp @@ -1,4 +1,4 @@ -#define SETTINGS_INTERFACE_IMPLEMENTATION +//#define SETTINGS_INTERFACE_IMPLEMENTATION #include #include @@ -616,6 +616,14 @@ void SettingsInterface::Impl::UpdateResetButton() } } +template class SettingsInterface; +template class SettingsInterface; +template class SettingsInterface; +template class SettingsInterface; + +// Containers are not to be used directly +template class SettingsInterface>; + } // namespace settings } // namespace qt } // namespace scwx diff --git a/scwx-qt/source/scwx/qt/settings/settings_variable.cpp b/scwx-qt/source/scwx/qt/settings/settings_variable.cpp index 1a7160f5..195dbd01 100644 --- a/scwx-qt/source/scwx/qt/settings/settings_variable.cpp +++ b/scwx-qt/source/scwx/qt/settings/settings_variable.cpp @@ -1,4 +1,4 @@ -#define SETTINGS_VARIABLE_IMPLEMENTATION +//#define SETTINGS_VARIABLE_IMPLEMENTATION #include #include @@ -402,6 +402,14 @@ bool SettingsVariable::Equals(const SettingsVariableBase& o) const p->maximum_ == v.p->maximum_; } +template class SettingsVariable; +template class SettingsVariable; +template class SettingsVariable; +template class SettingsVariable; + +// Containers are not to be used directly +template class SettingsVariable>; + } // namespace settings } // namespace qt } // namespace scwx