diff options
author | Harshit Maurya <hmaurya999@gmail.com> | 2020-05-16 01:48:12 +0530 |
---|---|---|
committer | Harshit Maurya <hmaurya999@gmail.com> | 2020-05-16 02:17:43 +0530 |
commit | c8e750602793436447dd065acf0c1cfed11cf2e2 (patch) | |
tree | e3c642d7cbbb3d371d4d2f572515c8975d352836 | |
parent | afe1282adc171754c44ff990b1de8c21af00c677 (diff) |
convert to const methods
-rw-r--r-- | src/waveform/renderers/waveformmark.cpp | 4 | ||||
-rw-r--r-- | src/waveform/renderers/waveformmark.h | 2 | ||||
-rw-r--r-- | src/waveform/renderers/waveformwidgetrenderer.cpp | 5 | ||||
-rw-r--r-- | src/waveform/renderers/waveformwidgetrenderer.h | 2 | ||||
-rw-r--r-- | src/widget/wwaveformviewer.cpp | 4 | ||||
-rw-r--r-- | src/widget/wwaveformviewer.h | 4 |
6 files changed, 11 insertions, 10 deletions
diff --git a/src/waveform/renderers/waveformmark.cpp b/src/waveform/renderers/waveformmark.cpp index 81a3d1cbe5..b9449d24b4 100644 --- a/src/waveform/renderers/waveformmark.cpp +++ b/src/waveform/renderers/waveformmark.cpp @@ -105,7 +105,7 @@ void WaveformMark::setBaseColor(QColor baseColor) { m_labelColor = Color::chooseColorByBrightness(baseColor, QColor(255,255,255,255), QColor(0,0,0,255)); }; -bool WaveformMark::contains(QPoint point, Qt::Orientation orientation) { +bool WaveformMark::contains(QPoint point, Qt::Orientation orientation) const { // Without some padding, the user would only have a single pixel width that // would count as hovering over the WaveformMark. float lineHoverPadding = 5.0; @@ -118,5 +118,5 @@ bool WaveformMark::contains(QPoint point, Qt::Orientation orientation) { bool lineHovered = m_linePosition >= position - lineHoverPadding && m_linePosition <= position + lineHoverPadding; - return (m_label.area().contains(point) || lineHovered); + return m_label.area().contains(point) || lineHovered; } diff --git a/src/waveform/renderers/waveformmark.h b/src/waveform/renderers/waveformmark.h index 5e3150126a..abb0da8286 100644 --- a/src/waveform/renderers/waveformmark.h +++ b/src/waveform/renderers/waveformmark.h @@ -67,7 +67,7 @@ class WaveformMark { } // Check if a point (in image co-ordinates) lies on drawn image. - bool contains(QPoint point, Qt::Orientation orientation); + bool contains(QPoint point, Qt::Orientation orientation) const; QColor m_textColor; QString m_text; diff --git a/src/waveform/renderers/waveformwidgetrenderer.cpp b/src/waveform/renderers/waveformwidgetrenderer.cpp index c73cc623d5..bd181fdf0f 100644 --- a/src/waveform/renderers/waveformwidgetrenderer.cpp +++ b/src/waveform/renderers/waveformwidgetrenderer.cpp @@ -289,13 +289,14 @@ void WaveformWidgetRenderer::setTrack(TrackPointer track) { } } -WaveformMarkPointer WaveformWidgetRenderer::getCueMarkAtPoint(QPoint point) { +WaveformMarkPointer WaveformWidgetRenderer::getCueMarkAtPoint(QPoint point) const { 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()); - } else { /* Vertical */ + } else { + DEBUG_ASSERT(getOrientation() == Qt::Vertical); pointInImageSpace = QPoint(point.x(), point.y() - markImagePositionInWidgetSpace); } if (pMark->contains(pointInImageSpace, getOrientation())) { diff --git a/src/waveform/renderers/waveformwidgetrenderer.h b/src/waveform/renderers/waveformwidgetrenderer.h index a255eaae65..6e7ef4b042 100644 --- a/src/waveform/renderers/waveformwidgetrenderer.h +++ b/src/waveform/renderers/waveformwidgetrenderer.h @@ -41,7 +41,7 @@ class WaveformWidgetRenderer { inline const char* getGroup() const { return m_group;} const TrackPointer getTrackInfo() const { return m_pTrack;} /// Get cue mark at a point on the waveform widget. - WaveformMarkPointer getCueMarkAtPoint(QPoint point); + WaveformMarkPointer getCueMarkAtPoint(QPoint point) const; double getFirstDisplayedPosition() const { return m_firstDisplayedPosition;} double getLastDisplayedPosition() const { return m_lastDisplayedPosition;} diff --git a/src/widget/wwaveformviewer.cpp b/src/widget/wwaveformviewer.cpp index 33990531e4..c26977f33a 100644 --- a/src/widget/wwaveformviewer.cpp +++ b/src/widget/wwaveformviewer.cpp @@ -255,7 +255,7 @@ void WWaveformViewer::setWaveformWidget(WaveformWidgetAbstract* waveformWidget) } } -CuePointer WWaveformViewer::getCuePointerFromCueMark(WaveformMarkPointer pMark) { +CuePointer WWaveformViewer::getCuePointerFromCueMark(WaveformMarkPointer pMark) const { if (pMark && pMark->getHotCue() != Cue::kNoHotCue) { QList<CuePointer> cueList = m_waveformWidget->getTrackInfo()->getCuePoints(); for (const auto& pCue : cueList) { @@ -277,6 +277,6 @@ void WWaveformViewer::unhighlightMark(WaveformMarkPointer pMark) { pMark->setBaseColor(originalColor); } -bool WWaveformViewer::isPlaying() { +bool WWaveformViewer::isPlaying() const { return m_pPlayEnabled->get(); } diff --git a/src/widget/wwaveformviewer.h b/src/widget/wwaveformviewer.h index caedc39599..c0733ad1ab 100644 --- a/src/widget/wwaveformviewer.h +++ b/src/widget/wwaveformviewer.h @@ -84,10 +84,10 @@ private: friend class WaveformWidgetFactory; - CuePointer getCuePointerFromCueMark(WaveformMarkPointer pMark); + CuePointer getCuePointerFromCueMark(WaveformMarkPointer pMark) const; void highlightMark(WaveformMarkPointer pMark); void unhighlightMark(WaveformMarkPointer pMark); - bool isPlaying(); + bool isPlaying() const; }; #endif |