From ebb342c969fab99d1c497b24f5511ebb427cdc92 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Mon, 13 Apr 2020 19:41:30 +0200 Subject: [PATCH] cleanup: turn protected into private members Some profilewidget classes hat protected members which can be made private as there is no subclassing. Signed-off-by: Berthold Stoeger --- profile-widget/divecartesianaxis.h | 8 +++----- profile-widget/divepixmapitem.h | 7 +++---- profile-widget/diveprofileitem.h | 4 +--- profile-widget/ruleritem.h | 3 +-- 4 files changed, 8 insertions(+), 14 deletions(-) diff --git a/profile-widget/divecartesianaxis.h b/profile-widget/divecartesianaxis.h index 2d65c5586..588e06ea1 100644 --- a/profile-widget/divecartesianaxis.h +++ b/profile-widget/divecartesianaxis.h @@ -81,7 +81,7 @@ class DepthAxis : public DiveCartesianAxis { Q_OBJECT public: DepthAxis(ProfileWidget2 *widget); -protected: +private: QString textForValue(double value); QColor colorForValue(double value); private @@ -94,8 +94,7 @@ class TimeAxis : public DiveCartesianAxis { public: TimeAxis(ProfileWidget2 *widget); void updateTicks(color_index_t color = TIME_GRID); - -protected: +private: QString textForValue(double value); QColor colorForValue(double value); }; @@ -104,7 +103,7 @@ class TemperatureAxis : public DiveCartesianAxis { Q_OBJECT public: TemperatureAxis(ProfileWidget2 *widget); -protected: +private: QString textForValue(double value); }; @@ -116,7 +115,6 @@ public: public slots: void settingsChanged(); - private: DivePlotDataModel *model; }; diff --git a/profile-widget/divepixmapitem.h b/profile-widget/divepixmapitem.h index cf5b86d7c..38007995c 100644 --- a/profile-widget/divepixmapitem.h +++ b/profile-widget/divepixmapitem.h @@ -19,11 +19,11 @@ class CloseButtonItem : public DivePixmapItem { Q_OBJECT public: CloseButtonItem(QGraphicsItem *parent = 0); -protected: - void mousePressEvent(QGraphicsSceneMouseEvent *event) override; public slots: void hide(); void show(); +private: + void mousePressEvent(QGraphicsSceneMouseEvent *event) override; }; class DivePictureItem : public DivePixmapItem { @@ -37,11 +37,10 @@ public slots: void settingsChanged(); void removePicture(); void setFileUrl(const QString& s); -protected: +private: void hoverEnterEvent(QGraphicsSceneHoverEvent *event); void hoverLeaveEvent(QGraphicsSceneHoverEvent *event); void mousePressEvent(QGraphicsSceneMouseEvent *event); -private: QString fileUrl; QGraphicsRectItem *canvas; QGraphicsRectItem *shadow; diff --git a/profile-widget/diveprofileitem.h b/profile-widget/diveprofileitem.h index 36f6e5980..df46b6e12 100644 --- a/profile-widget/diveprofileitem.h +++ b/profile-widget/diveprofileitem.h @@ -183,10 +183,8 @@ public slots: void recalc(); -protected: - ProfileWidget2 *profileWidget; - private: + ProfileWidget2 *profileWidget; bool is3mIncrement; }; diff --git a/profile-widget/ruleritem.h b/profile-widget/ruleritem.h index dd028fc1f..14cdbe36f 100644 --- a/profile-widget/ruleritem.h +++ b/profile-widget/ruleritem.h @@ -21,9 +21,8 @@ public: void setPlotInfo(const struct plot_info &info); void recalculate(); -protected: - void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override; private: + void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override; struct plot_info pInfo; int idx; RulerItem2 *ruler;