From 2538208c71d4daecb5724661a01dce08b5275137 Mon Sep 17 00:00:00 2001
From: Harshit Maurya <hmaurya999@gmail.com>
Date: Fri, 15 May 2020 23:11:21 +0530
Subject: rename variables and change comments

---
 src/waveform/renderers/waveformrendermark.cpp     | 6 +++---
 src/waveform/renderers/waveformwidgetrenderer.cpp | 6 +++---
 src/waveform/renderers/waveformwidgetrenderer.h   | 8 ++++----
 src/widget/wwaveformviewer.cpp                    | 2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/waveform/renderers/waveformrendermark.cpp b/src/waveform/renderers/waveformrendermark.cpp
index 494df752c4..5e9356fae7 100644
--- a/src/waveform/renderers/waveformrendermark.cpp
+++ b/src/waveform/renderers/waveformrendermark.cpp
@@ -31,7 +31,7 @@ void WaveformRenderMark::setup(const QDomNode& node, const SkinContext& context)
 
 void WaveformRenderMark::draw(QPainter* painter, QPaintEvent* /*event*/) {
     PainterScope PainterScope(painter);
-    // Maps mark image offset to mark object.
+    // Maps mark objects to their positions in the widget.
     QMap<WaveformMarkPointer, int> marksOnScreen;
     /*
     //DEBUG
@@ -67,7 +67,7 @@ void WaveformRenderMark::draw(QPainter* painter, QPaintEvent* /*event*/) {
                 const int markHalfWidth = pMark->m_image.width() / 2.0
                         / m_waveformRenderer->getDevicePixelRatio();
 
-                // Check if the current point need to be displayed
+                // Check if the current point needs to be displayed.
                 if (currentMarkPoint > -markHalfWidth && currentMarkPoint < m_waveformRenderer->getWidth() + markHalfWidth) {
                     int drawOffset = currentMarkPoint - markHalfWidth;
                     painter->drawImage(QPoint(drawOffset, 0), pMark->m_image);
@@ -85,7 +85,7 @@ void WaveformRenderMark::draw(QPainter* painter, QPaintEvent* /*event*/) {
             }
         }
     }
-    m_waveformRenderer->setMarkLabelBoundaries(marksOnScreen);
+    m_waveformRenderer->setMarkPositions(marksOnScreen);
 }
 
 void WaveformRenderMark::onResize() {
diff --git a/src/waveform/renderers/waveformwidgetrenderer.cpp b/src/waveform/renderers/waveformwidgetrenderer.cpp
index 850a76f5d2..c73cc623d5 100644
--- a/src/waveform/renderers/waveformwidgetrenderer.cpp
+++ b/src/waveform/renderers/waveformwidgetrenderer.cpp
@@ -290,8 +290,8 @@ void WaveformWidgetRenderer::setTrack(TrackPointer track) {
 }
 
 WaveformMarkPointer WaveformWidgetRenderer::getCueMarkAtPoint(QPoint point) {
-    for (const auto& pMark : m_markLabelOffsets.keys()) {
-        int markImagePositionInWidgetSpace = m_markLabelOffsets[pMark];
+    for (const auto& pMark : m_markPositions.keys()) {
+        int markImagePositionInWidgetSpace = m_markPositions[pMark];
         QPoint pointInImageSpace;
         if (getOrientation() == Qt::Horizontal) {
             pointInImageSpace = QPoint(point.x() - markImagePositionInWidgetSpace, point.y());
@@ -302,5 +302,5 @@ WaveformMarkPointer WaveformWidgetRenderer::getCueMarkAtPoint(QPoint point) {
             return pMark;
         }
     }
-    return static_cast<WaveformMarkPointer>(nullptr);
+    return nullptr;
 }
diff --git a/src/waveform/renderers/waveformwidgetrenderer.h b/src/waveform/renderers/waveformwidgetrenderer.h
index 3f58560e4a..a255eaae65 100644
--- a/src/waveform/renderers/waveformwidgetrenderer.h
+++ b/src/waveform/renderers/waveformwidgetrenderer.h
@@ -40,7 +40,7 @@ class WaveformWidgetRenderer {
 
     inline const char* getGroup() const { return m_group;}
     const TrackPointer getTrackInfo() const { return m_pTrack;}
-    // Get cue at a point on the waveform widget.
+    /// Get cue mark at a point on the waveform widget.
     WaveformMarkPointer getCueMarkAtPoint(QPoint point);
 
     double getFirstDisplayedPosition() const { return m_firstDisplayedPosition;}
@@ -96,8 +96,8 @@ class WaveformWidgetRenderer {
     }
 
     void setTrack(TrackPointer track);
-    void setMarkLabelBoundaries(QMap<WaveformMarkPointer, int> markLabelOffsets) {
-        m_markLabelOffsets = markLabelOffsets;
+    void setMarkPositions(QMap<WaveformMarkPointer, int> markPositions) {
+        m_markPositions = markPositions;
     }
 
     double getPlayMarkerPosition() {
@@ -157,7 +157,7 @@ class WaveformWidgetRenderer {
 private:
     DISALLOW_COPY_AND_ASSIGN(WaveformWidgetRenderer);
     friend class WaveformWidgetFactory;
-    QMap<WaveformMarkPointer, int> m_markLabelOffsets;
+    QMap<WaveformMarkPointer, int> m_markPositions;
 };
 
 #endif // WAVEFORMWIDGETRENDERER_H
diff --git a/src/widget/wwaveformviewer.cpp b/src/widget/wwaveformviewer.cpp
index 966a1a2805..a01e9b5424 100644
--- a/src/widget/wwaveformviewer.cpp
+++ b/src/widget/wwaveformviewer.cpp
@@ -265,7 +265,7 @@ CuePointer WWaveformViewer::getCuePointerFromCueMark(WaveformMarkPointer pMark)
             }
         }
     }
-    return static_cast<CuePointer>(nullptr);
+    return CuePointer();
 }
 
 void WWaveformViewer::highlightMark(WaveformMarkPointer pMark) {
-- 
cgit v1.2.3