From e61466e178e9062a7202f24f609baa12d21df5ea Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Thu, 24 Dec 2020 19:13:16 +0100 Subject: profile: turn static into member variable When the settings change, the depth axis is redrawn to reflect metric/imperial units. To check whether the units changed, the old length unit is saved in a static variable. This makes no sense and allows for only one depth axis. Make this a normal member variable that is initialized in the constructor. Also remove the settingsChanged() call in the constructor, since this is a no-op (the depth unit is unchanged). Contains a whitespace fix. Signed-off-by: Berthold Stoeger --- profile-widget/divecartesianaxis.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'profile-widget/divecartesianaxis.cpp') diff --git a/profile-widget/divecartesianaxis.cpp b/profile-widget/divecartesianaxis.cpp index 944b636cc..8ee74e7f1 100644 --- a/profile-widget/divecartesianaxis.cpp +++ b/profile-widget/divecartesianaxis.cpp @@ -361,17 +361,16 @@ QColor DepthAxis::colorForValue(double) const return QColor(Qt::red); } -DepthAxis::DepthAxis(ProfileWidget2 *widget) : DiveCartesianAxis(widget) +DepthAxis::DepthAxis(ProfileWidget2 *widget) : DiveCartesianAxis(widget), + unitSystem(prefs.units.length) { connect(&diveListNotifier, &DiveListNotifier::settingsChanged, this, &DepthAxis::settingsChanged); changed = true; - settingsChanged(); } void DepthAxis::settingsChanged() { - static int unitSystem = prefs.units.length; - if ( unitSystem == prefs.units.length ) + if (unitSystem == prefs.units.length) return; changed = true; updateTicks(); -- cgit v1.2.3-70-g09d2