From 1fb6674e98d45b96ca6625206de8705f6e4bc17a Mon Sep 17 00:00:00 2001 From: Joachim Schmitz Date: Mon, 22 Feb 2021 11:44:18 +0100 Subject: [PATCH 1/2] fix warnings reg. duplicate names in editstyle.ui --- src/notation/view/widgets/editstyle.ui | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/notation/view/widgets/editstyle.ui b/src/notation/view/widgets/editstyle.ui index b500ac0fd9..ef59db4d60 100644 --- a/src/notation/view/widgets/editstyle.ui +++ b/src/notation/view/widgets/editstyle.ui @@ -5700,9 +5700,9 @@ By default, they will be placed such as that their right end are at the same lev false - + - + Qt::Horizontal @@ -5749,7 +5749,7 @@ By default, they will be placed such as that their right end are at the same lev - + Spacing of symbols: @@ -8998,7 +8998,7 @@ By default, they will be placed such as that their right end are at the same lev System Text Line - + @@ -9129,7 +9129,7 @@ By default, they will be placed such as that their right end are at the same lev - + Qt::Vertical @@ -11671,7 +11671,7 @@ By default, they will be placed such as that their right end are at the same lev - + Maximum shift below: @@ -11702,7 +11702,7 @@ By default, they will be placed such as that their right end are at the same lev - + Maximum shift above: @@ -11842,7 +11842,7 @@ By default, they will be placed such as that their right end are at the same lev - + Qt::Vertical @@ -11878,7 +11878,7 @@ By default, they will be placed such as that their right end are at the same lev - + Maximum shift below: @@ -12098,7 +12098,7 @@ By default, they will be placed such as that their right end are at the same lev - + Maximum shift above: @@ -12710,7 +12710,7 @@ By default, they will be placed such as that their right end are at the same lev - + Line Spacing: From a1be61a18b7b0f7762ca1ef4f5cc2bccb52c1338 Mon Sep 17 00:00:00 2001 From: Joachim Schmitz Date: Mon, 22 Feb 2021 11:45:22 +0100 Subject: [PATCH 2/2] fix compiler wanings reg unused resp. shadowed parameter --- src/framework/audio/internal/platform/win/winmmdriver.cpp | 2 +- src/framework/audio/internal/worker/sequencer.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/framework/audio/internal/platform/win/winmmdriver.cpp b/src/framework/audio/internal/platform/win/winmmdriver.cpp index 0cdd40007a..8a56d97365 100644 --- a/src/framework/audio/internal/platform/win/winmmdriver.cpp +++ b/src/framework/audio/internal/platform/win/winmmdriver.cpp @@ -220,7 +220,7 @@ std::string WinmmDriver::outputDevice() const return "default"; } -bool WinmmDriver::selectOutputDevice(const std::string& name) +bool WinmmDriver::selectOutputDevice(const std::string& /*name*/) { NOT_IMPLEMENTED; return false; diff --git a/src/framework/audio/internal/worker/sequencer.cpp b/src/framework/audio/internal/worker/sequencer.cpp index 4d08230452..01f77958b0 100644 --- a/src/framework/audio/internal/worker/sequencer.cpp +++ b/src/framework/audio/internal/worker/sequencer.cpp @@ -197,12 +197,12 @@ void Sequencer::beforeTimeUpdate(Clock::time_t milliseconds) } if (m_nextSeek.has_value()) { - auto milliseconds = m_nextSeek.value_or(0); + auto millisecs = m_nextSeek.value_or(0); m_nextSeek.reset(); - m_clock->seekMiliseconds(milliseconds); + m_clock->seekMiliseconds(millisecs); for (auto& track : m_tracks) { - track.second->seek(milliseconds); + track.second->seek(millisecs); } m_positionChanged.notify(); }