From 7744fec0bf9a918d4cc97859c0f736363523c51f Mon Sep 17 00:00:00 2001 From: Berthold Stoeger <bstoeger@mail.tuwien.ac.at> Date: Wed, 2 Jun 2021 11:24:14 +0200 Subject: [PATCH] cleanup: reuse constructor of DiveCartesianAxis The constructors of Time- and TemperatureAxis don't do anything. In reasonable modern C++ we can simply reuse the constructor of the base class with a "using" directive. The point here is to simplify followup commits that will add additional parameters to the constructors of the axes. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at> --- profile-widget/divecartesianaxis.cpp | 8 -------- profile-widget/divecartesianaxis.h | 4 ++-- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/profile-widget/divecartesianaxis.cpp b/profile-widget/divecartesianaxis.cpp index 533773072..0f0ad5fd0 100644 --- a/profile-widget/divecartesianaxis.cpp +++ b/profile-widget/divecartesianaxis.cpp @@ -370,10 +370,6 @@ void DepthAxis::settingsChanged() unitSystem = prefs.units.length; } -TimeAxis::TimeAxis(ProfileWidget2 *widget) : DiveCartesianAxis(widget) -{ -} - QColor TimeAxis::colorForValue(double) const { return QColor(Qt::blue); @@ -397,10 +393,6 @@ void TimeAxis::updateTicks(color_index_t color) } } -TemperatureAxis::TemperatureAxis(ProfileWidget2 *widget) : DiveCartesianAxis(widget) -{ -} - QString TemperatureAxis::textForValue(double value) const { return QString::number(mkelvin_to_C((int)value)); diff --git a/profile-widget/divecartesianaxis.h b/profile-widget/divecartesianaxis.h index 67b05a56a..c584299f7 100644 --- a/profile-widget/divecartesianaxis.h +++ b/profile-widget/divecartesianaxis.h @@ -88,7 +88,7 @@ slots: class TimeAxis : public DiveCartesianAxis { Q_OBJECT public: - TimeAxis(ProfileWidget2 *widget); + using DiveCartesianAxis::DiveCartesianAxis; void updateTicks(color_index_t color = TIME_GRID) override; private: QString textForValue(double value) const override; @@ -98,7 +98,7 @@ private: class TemperatureAxis : public DiveCartesianAxis { Q_OBJECT public: - TemperatureAxis(ProfileWidget2 *widget); + using DiveCartesianAxis::DiveCartesianAxis; private: QString textForValue(double value) const override; };