From ac1ab59f78cf09221c8cc8825c9d2c00ff6a60f8 Mon Sep 17 00:00:00 2001 From: Casper Jeukendrup <48658420+cbjeukendrup@users.noreply.github.com> Date: Tue, 16 Nov 2021 14:53:22 +0100 Subject: [PATCH] Fix compiler warnings --- src/autobot/autobottypes.h | 4 ++-- src/autobot/internal/autobot.h | 2 +- src/engraving/style/style.cpp | 2 +- src/notation/view/widgets/editstyle.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/autobot/autobottypes.h b/src/autobot/autobottypes.h index 7f3573481d..a3d82aad48 100644 --- a/src/autobot/autobottypes.h +++ b/src/autobot/autobottypes.h @@ -133,7 +133,7 @@ enum class SpeedMode { Slow }; -static QString speedModeToString(SpeedMode mode) +inline QString speedModeToString(SpeedMode mode) { switch (mode) { case SpeedMode::Undefined: return ""; @@ -145,7 +145,7 @@ static QString speedModeToString(SpeedMode mode) return QString(); } -static SpeedMode speedModeFromString(const QString& str) +inline SpeedMode speedModeFromString(const QString& str) { if (str == "Default") { return SpeedMode::Default; diff --git a/src/autobot/internal/autobot.h b/src/autobot/internal/autobot.h index 881583294d..438b4ef739 100644 --- a/src/autobot/internal/autobot.h +++ b/src/autobot/internal/autobot.h @@ -62,7 +62,7 @@ public: void setSpeedMode(SpeedMode mode) override; async::Channel speedModeChanged() const override; void setDefaultIntervalMsec(int msec) override; - int defaultIntervalMsec() const; + int defaultIntervalMsec() const override; int intervalMsec() const override; void execScript(const io::path& path) override; diff --git a/src/engraving/style/style.cpp b/src/engraving/style/style.cpp index 231b612282..bb70bc408b 100644 --- a/src/engraving/style/style.cpp +++ b/src/engraving/style/style.cpp @@ -162,7 +162,7 @@ bool MStyle::readProperties(XmlReader& e) set(idx, c); e.readElementText(); } else { - qFatal("unhandled type %s", type); + qFatal("unhandled type %d", type); } return true; } diff --git a/src/notation/view/widgets/editstyle.cpp b/src/notation/view/widgets/editstyle.cpp index 17268490b8..922274f87e 100644 --- a/src/notation/view/widgets/editstyle.cpp +++ b/src/notation/view/widgets/editstyle.cpp @@ -1352,7 +1352,7 @@ void EditStyle::on_resetStylesButton_clicked() void EditStyle::unhandledType(const StyleWidget sw) { Ms::P_TYPE type = Ms::MStyle::valueType(sw.idx); - qFatal("%s <%s>: widget: %s\n", type, Ms::MStyle::valueName(sw.idx), sw.widget->metaObject()->className()); + qFatal("%d <%s>: widget: %s\n", type, Ms::MStyle::valueName(sw.idx), sw.widget->metaObject()->className()); } //---------------------------------------------------------