diff options
author | Harshit Maurya <hmaurya999@gmail.com> | 2020-05-14 00:18:02 +0530 |
---|---|---|
committer | Harshit Maurya <hmaurya999@gmail.com> | 2020-05-16 02:17:43 +0530 |
commit | 26b812a9d7e4cce4fb04db66fc2ea90f0889aaf5 (patch) | |
tree | 726909feefbc32007955eec5d15feb6e915d852d | |
parent | dff5c2b2828b8c8e86d4958f42390e09794d513c (diff) |
waveformwidgetrenderer: remove std::optional wrapping
-rw-r--r-- | src/waveform/renderers/waveformwidgetrenderer.cpp | 15 | ||||
-rw-r--r-- | src/waveform/renderers/waveformwidgetrenderer.h | 2 | ||||
-rw-r--r-- | src/widget/wwaveformviewer.cpp | 2 |
3 files changed, 7 insertions, 12 deletions
diff --git a/src/waveform/renderers/waveformwidgetrenderer.cpp b/src/waveform/renderers/waveformwidgetrenderer.cpp index ce6b9b5cd7..79499d0712 100644 --- a/src/waveform/renderers/waveformwidgetrenderer.cpp +++ b/src/waveform/renderers/waveformwidgetrenderer.cpp @@ -289,7 +289,7 @@ void WaveformWidgetRenderer::setTrack(TrackPointer track) { } } -std::optional<CuePointer> WaveformWidgetRenderer::getCueAtPoint(QPoint point) { +CuePointer WaveformWidgetRenderer::getCueAtPoint(QPoint point) { WaveformMarkPointer pSelectedMark; const int lineHoverpadding = 5; for (const auto& pMark : m_markLabelOffsets.keys()) { @@ -333,19 +333,14 @@ std::optional<CuePointer> WaveformWidgetRenderer::getCueAtPoint(QPoint point) { } } if (!pSelectedMark) { - return std::nullopt; + return static_cast<CuePointer>(nullptr); } - CuePointer pSelectedCue; + QList<CuePointer> cueList = getTrackInfo()->getCuePoints(); for (const auto& pCue : cueList) { if (pCue->getHotCue() == pSelectedMark->getHotCue()) { - pSelectedCue = pCue; - break; + return pCue; } } - if (pSelectedCue != nullptr) { - return pSelectedCue; - } - - return std::nullopt; + return static_cast<CuePointer>(nullptr); } diff --git a/src/waveform/renderers/waveformwidgetrenderer.h b/src/waveform/renderers/waveformwidgetrenderer.h index 4b67dc599b..c4841c091b 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 at a point on the waveform widget. - std::optional<CuePointer> getCueAtPoint(QPoint point); + CuePointer getCueAtPoint(QPoint point); 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 d13813ea39..aeae0512ba 100644 --- a/src/widget/wwaveformviewer.cpp +++ b/src/widget/wwaveformviewer.cpp @@ -87,7 +87,7 @@ void WWaveformViewer::mousePressEvent(QMouseEvent* event) { const auto currentTrack = m_waveformWidget->getTrackInfo(); auto cueAtClickPos = m_waveformWidget->getCueAtPoint(m_mouseAnchor); if (cueAtClickPos) { - m_pCueMenuPopup->setTrackAndCue(currentTrack, *cueAtClickPos); + m_pCueMenuPopup->setTrackAndCue(currentTrack, cueAtClickPos); m_pCueMenuPopup->popup(event->globalPos()); m_bHotcueMenuShowing = true; } else { |