blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-31 18:00:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

changed unitAbbreviation_ over to not use pointers

Browse source
This commit is contained in:
AdenKoperczak 2024-07-26 11:42:48 -04:00
parent 54748ce812
commit 801125d87a
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
scwx-qt/source/scwx/qt/settings/settings_interface.cpp
View file

@ -55,9 +55,9 @@ public:
std::function<std::string(const T&)> mapFromValue_ {nullptr}; std::function<std::string(const T&)> mapFromValue_ {nullptr};
std::function<T(const std::string&)> mapToValue_ {nullptr}; std::function<T(const std::string&)> mapToValue_ {nullptr};
double unitScale_ {1}; double unitScale_ {1};
const std::string * unitAbbreviation_ {nullptr}; std::optional<std::string> unitAbbreviation_ {};
bool unitEnabled_ {false}; bool unitEnabled_ {false};
}; };
template<class T> template<class T>
@ -483,9 +483,9 @@ template<class T>
void SettingsInterface<T>::SetUnit(const double& scale, void SettingsInterface<T>::SetUnit(const double& scale,
const std::string& abbreviation) const std::string& abbreviation)
{ {
p->unitScale_ = scale; p->unitScale_ = scale;
p->unitAbbreviation_ = &abbreviation; p->unitAbbreviation_ = abbreviation;
p->unitEnabled_ = true; p->unitEnabled_ = true;
p->UpdateEditWidget(); p->UpdateEditWidget();
p->UpdateUnitLabel(); p->UpdateUnitLabel();
} }
@ -604,7 +604,7 @@ void SettingsInterface<T>::Impl::UpdateUnitLabel()
return; return;
} }
unitLabel_->setText(QString::fromStdString(*unitAbbreviation_)); unitLabel_->setText(QString::fromStdString(unitAbbreviation_.value_or("")));
} }
template<class T> template<class T>