From e52a163529ec8d8be1dd9470f485c2d9caa2316a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Wed, 2 Mar 2016 09:34:39 +0100 Subject: [PATCH] Refactoring --- src/graphview.cpp | 4 ++-- src/graphview.h | 2 +- src/trackview.cpp | 4 ++-- src/trackview.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/graphview.cpp b/src/graphview.cpp index ceba952d..a8ac1cd3 100644 --- a/src/graphview.cpp +++ b/src/graphview.cpp @@ -131,7 +131,7 @@ void GraphView::loadData(const QVector &data) { QPainterPath path; QGraphicsPathItem *pi; - QColor color = _colorShop.color(); + QColor color = _palette.color(); if (data.size() < 2) @@ -262,7 +262,7 @@ void GraphView::clear() _info->clear(); _scene->clear(); _graphs.clear(); - _colorShop.reset(); + _palette.reset(); _xMax = -FLT_MAX; _xMin = FLT_MAX; diff --git a/src/graphview.h b/src/graphview.h index 523b6562..aff2be98 100644 --- a/src/graphview.h +++ b/src/graphview.h @@ -84,7 +84,7 @@ private: QList _graphs; qreal _xMin, _xMax, _yMin, _yMax; - Palette _colorShop; + Palette _palette; }; #endif // GRAPHVIEW_H diff --git a/src/trackview.cpp b/src/trackview.cpp index 6758682b..ac486a14 100644 --- a/src/trackview.cpp +++ b/src/trackview.cpp @@ -50,7 +50,7 @@ void TrackView::loadGPX(const GPX &gpx) QPainterPath path; QGraphicsPathItem *pi; MarkerItem *mi; - QColor color = _colorShop.color(); + QColor color = _palette.color(); qreal prevScale = _scale; @@ -319,7 +319,7 @@ void TrackView::clear() _trackPaths.clear(); _markers.clear(); _scene->clear(); - _colorShop.reset(); + _palette.reset(); _maxLen = 0; diff --git a/src/trackview.h b/src/trackview.h index b6a60559..f4a1ea54 100644 --- a/src/trackview.h +++ b/src/trackview.h @@ -65,7 +65,7 @@ private: Map *_map; ScaleItem *_mapScale; - Palette _colorShop; + Palette _palette; qreal _maxLen; qreal _scale;