[MU4] Fixed compiler warnings and move to Qt 5.15

audio/drivers/alsa.h

@@ -69,12 +69,10 @@ class AlsaDriver
     unsigned int _play_nchan;
     int _play_npfd;
     PollFd _pfd[MAXPFD];
-    snd_pcm_uframes_t _capt_offs;
     snd_pcm_uframes_t _play_offs;
     int _play_step;
     char* _play_ptr[MAXPLAY];
     int _stat;
-    int _pcnt;
     bool _xrun;
     clear_function _clear_func;
     play_function _play_func;
@@ -125,21 +123,21 @@ class AlsaAudio : public Driver
 public:
     AlsaAudio(Seq*);
     virtual ~AlsaAudio();
-    virtual bool init(bool hot = false);
-    virtual bool start(bool hotPlug = false);
-    virtual bool stop();
+    virtual bool init(bool hot = false) override;
+    virtual bool start(bool hotPlug = false) override;
+    virtual bool stop() override;
     float* getLBuffer(long n);
     float* getRBuffer(long n);
     virtual bool isRealtime() const { return false; }
-    virtual void startTransport();
-    virtual void stopTransport();
+    virtual void startTransport() override;
+    virtual void stopTransport() override;
     virtual Transport getState() override;
-    virtual int sampleRate() const;
+    virtual int sampleRate() const override;
     void alsaLoop();
     void write(int n, void* l);
 
-    virtual void midiRead();
-    virtual void updateOutPortCount(int maxport);
+    virtual void midiRead() override;
+    virtual void updateOutPortCount(int maxport) override;
 };
 }
 #endif

audio/drivers/jackaudio.h

@@ -63,29 +63,29 @@ class JackAudio : public Driver
 public:
     JackAudio(Seq*);
     virtual ~JackAudio();
-    virtual bool init(bool hot = false);
-    virtual bool start(bool hotPlug = false);
-    virtual bool stop();
+    virtual bool init(bool hot = false) override;
+    virtual bool start(bool hotPlug = false) override;
+    virtual bool stop() override;
     int framePos() const;
     void connect(void*, void*);
     void connect(const char* src, const char* dst);
     void disconnect(void* src, void* dst);
     virtual bool isRealtime() const { return jack_is_realtime(client); }
-    virtual void startTransport();
-    virtual void stopTransport();
+    virtual void startTransport() override;
+    virtual void stopTransport() override;
     virtual Transport getState() override;
-    virtual void seekTransport(int);
-    virtual int sampleRate() const { return jack_get_sample_rate(client); }
-    virtual void putEvent(const NPlayEvent&, unsigned framePos);
-    virtual void midiRead();
+    virtual void seekTransport(int) override;
+    virtual int sampleRate() const override { return jack_get_sample_rate(client); }
+    virtual void putEvent(const NPlayEvent&, unsigned framePos) override;
+    virtual void midiRead() override;
 
     virtual void registerPort(const QString& name, bool input, bool midi);
     virtual void unregisterPort(jack_port_t*);
-    virtual void handleTimeSigTempoChanged();
-    virtual void checkTransportSeek(int, int, bool);
-    virtual int bufferSize() { return _segmentSize; }
+    virtual void handleTimeSigTempoChanged() override;
+    virtual void checkTransportSeek(int, int, bool) override;
+    virtual int bufferSize() override { return _segmentSize; }
     void setBufferSize(int nframes) { _segmentSize = nframes; }
-    void updateOutPortCount(int);
+    void updateOutPortCount(int) override;
 };
 } // namespace Ms
 #endif

audio/drivers/pa.h

@@ -49,16 +49,16 @@ class Portaudio : public Driver
 public:
     Portaudio(Seq*);
     virtual ~Portaudio();
-    virtual bool init(bool hot = false);
-    virtual bool start(bool hotPlug = false);
-    virtual bool stop();
-    virtual void startTransport();
-    virtual void stopTransport();
+    virtual bool init(bool hot = false) override;
+    virtual bool start(bool hotPlug = false) override;
+    virtual bool stop() override;
+    virtual void startTransport() override;
+    virtual void stopTransport() override;
     virtual Transport getState() override;
-    virtual int sampleRate() const { return _sampleRate; }
-    virtual void midiRead();
+    virtual int sampleRate() const override { return _sampleRate; }
+    virtual void midiRead() override;
 #ifdef USE_PORTMIDI
-    virtual void putEvent(const NPlayEvent&, unsigned framePos);
+    virtual void putEvent(const NPlayEvent&, unsigned framePos) override;
 #endif
 
     int framePos() const;

audio/drivers/pulseaudio.cpp

@@ -43,13 +43,13 @@ class PulseAudio : public Driver
 public:
     PulseAudio(Seq*);
     virtual ~PulseAudio();
-    virtual bool init(bool hot = false);
-    virtual bool start(bool hotPlug = false);
-    virtual bool stop();
+    virtual bool init(bool hot = false) override;
+    virtual bool start(bool hotPlug = false) override;
+    virtual bool stop() override;
     virtual Transport getState() override { return state; }
-    virtual int sampleRate() const { return _sampleRate; }
-    virtual void stopTransport() { state = Transport::STOP; }
-    virtual void startTransport() { state = Transport::PLAY; }
+    virtual int sampleRate() const override { return _sampleRate; }
+    virtual void stopTransport() override { state = Transport::STOP; }
+    virtual void startTransport() override { state = Transport::PLAY; }
 };
 
 //---------------------------------------------------------

audio/midi/fluid/fluid.h

@@ -339,19 +339,19 @@ class Fluid : public Synthesizer
 public:
     Fluid();
     ~Fluid();
-    virtual void init(float sampleRate);
+    virtual void init(float sampleRate) override;
 
-    virtual const char* name() const { return "Fluid"; }
+    virtual const char* name() const override { return "Fluid"; }
 
-    virtual void play(const PlayEvent&);
-    virtual const QList<MidiPatch*>& getPatchInfo() const { return patches; }
+    virtual void play(const PlayEvent&) override;
+    virtual const QList<MidiPatch*>& getPatchInfo() const override { return patches; }
 
     // get/set synthesizer state (parameter set)
-    virtual SynthesizerGroup state() const;
-    virtual bool setState(const SynthesizerGroup&);
+    virtual SynthesizerGroup state() const override;
+    virtual bool setState(const SynthesizerGroup&) override;
 
-    virtual void allSoundsOff(int);
-    virtual void allNotesOff(int);
+    virtual void allSoundsOff(int) override;
+    virtual void allNotesOff(int) override;
 
     int loadProgress() { return _loadProgress; }
     void setLoadProgress(int val) { _loadProgress = val; }
@@ -383,17 +383,17 @@ class Fluid : public Synthesizer
 
     Preset* get_channel_preset(int chan) const { return channel[chan]->preset(); }
 
-    virtual bool loadSoundFonts(const QStringList& s);
-    virtual bool addSoundFont(const QString& s);
-    virtual bool removeSoundFont(const QString& s);
+    virtual bool loadSoundFonts(const QStringList& s) override;
+    virtual bool addSoundFont(const QString& s) override;
+    virtual bool removeSoundFont(const QString& s) override;
     QStringList soundFonts() const;
     std::vector<SoundFontInfo> soundFontsInfo() const override;
 
     void start_voice(Voice* voice);
     Voice* alloc_voice(unsigned id, Sample* sample, int chan, int key, int vel, double vt);
     void free_voice_by_kill();
 
-    virtual void process(unsigned len, float* out, float* effect1, float* effect2);
+    virtual void process(unsigned len, float* out, float* effect1, float* effect2) override;
 
     bool program_select(int chan, unsigned sfont_id, unsigned bank_num, unsigned preset_num);
     void get_program(int chan, unsigned* sfont_id, unsigned* bank_num, unsigned* preset_num);
@@ -412,12 +412,12 @@ class Fluid : public Synthesizer
     float act2hz(float c) { return 8.176 * pow(2.0, (double)c / 1200.0); }
     float ct2hz(float cents) { return act2hz(qBound(1500.0f, cents, 13500.0f)); }
 
-    virtual double masterTuning() const { return _masterTuning; }
-    virtual void setMasterTuning(double f) { _masterTuning = f; }
+    virtual double masterTuning() const override { return _masterTuning; }
+    virtual void setMasterTuning(double f) override { _masterTuning = f; }
 
     QString error() const { return _error; }
 
-    virtual SynthesizerGui* gui();
+    virtual SynthesizerGui* gui() override;
 
     static QFileInfoList sfFiles();
 

audio/midi/zerberus/zerberus.h

@@ -106,8 +106,8 @@ class Zerberus : public Ms::Synthesizer
     Zerberus();
     ~Zerberus();
 
-    virtual void process(unsigned frames, float*, float*, float*);
-    virtual void play(const Ms::PlayEvent& event);
+    virtual void process(unsigned frames, float*, float*, float*) override;
+    virtual void play(const Ms::PlayEvent& event) override;
 
     bool loadInstrument(const QString&);
 
@@ -119,22 +119,22 @@ class Zerberus : public Ms::Synthesizer
     bool loadWasCanceled() { return _loadWasCanceled; }
     void setLoadWasCanceled(bool status) { _loadWasCanceled = status; }
 
-    virtual void setMasterTuning(double val) { _masterTuning = val; }
-    virtual double masterTuning() const { return _masterTuning; }
+    virtual void setMasterTuning(double val) override { _masterTuning = val; }
+    virtual double masterTuning() const override { return _masterTuning; }
 
     double ct2hz(double c) const { return pow(2.0, (c - 6900.0) / 1200.0) * masterTuning(); }
 
-    virtual const char* name() const;
+    virtual const char* name() const override;
 
-    virtual Ms::SynthesizerGroup state() const;
-    virtual bool setState(const Ms::SynthesizerGroup&);
+    virtual Ms::SynthesizerGroup state() const override;
+    virtual bool setState(const Ms::SynthesizerGroup&) override;
 
-    virtual void allSoundsOff(int channel);
-    virtual void allNotesOff(int channel);
+    virtual void allSoundsOff(int channel) override;
+    virtual void allNotesOff(int channel) override;
 
-    virtual bool addSoundFont(const QString&);
-    virtual bool removeSoundFont(const QString&);
-    virtual bool loadSoundFonts(const QStringList&);
+    virtual bool addSoundFont(const QString&) override;
+    virtual bool removeSoundFont(const QString&) override;
+    virtual bool loadSoundFonts(const QStringList&) override;
     virtual bool removeSoundFonts(const QStringList& fileNames);
     QStringList soundFonts() const;
     std::vector<Ms::SoundFontInfo> soundFontsInfo() const override;
@@ -143,7 +143,7 @@ class Zerberus : public Ms::Synthesizer
 
     void updatePatchList();
 
-    virtual Ms::SynthesizerGui* gui();
+    virtual Ms::SynthesizerGui* gui() override;
     static QFileInfoList sfzFiles();
 };
 

framework/audio/internal/rpcmidisource.cpp

@@ -28,7 +28,7 @@ using namespace mu::audio::worker;
 RpcMidiSource::RpcMidiSource(const std::string& name)
     : RpcSourceBase(CallType::Midi, name)
 {
-    listen([this](const CallMethod& /*method*/, const Args& /*args*/) {});
+    listen([](const CallMethod& /*method*/, const Args& /*args*/) {});
 }
 
 std::shared_ptr<IAudioSource> RpcMidiSource::audioSource()

framework/midi/internal/sequencer.h

@@ -52,7 +52,7 @@ class Sequencer : public ISequencer, public async::Asyncable
 
     Status status() const;
 
-    void loadMIDI(const std::shared_ptr<midi::MidiStream>& stream);
+    void loadMIDI(const std::shared_ptr<midi::MidiStream>& stream) override;
 
     bool run(float init_sec) override;
     void seek(float sec) override;

framework/midi/internal/zerberus/zerberus.h

@@ -86,7 +86,6 @@ class Zerberus //: public Ms::Synthesizer
     std::list<ZInstrument*> instruments;
     Channel* _channel[MAX_CHANNELS];
 
-    int allocatedVoices = 0;
     VoiceFifo freeVoices;
     Voice* activeVoices = 0;
     int _loadProgress = 0;

framework/ui/qml/MuseScore/Ui/InteractiveProvider.qml

@@ -21,7 +21,7 @@ Item {
     Connections {
         target: root.provider
 
-        onFireOpen: {
+        function onFireOpen(data) {
 
             var page = data.data()
             console.log("try open uri: " + data.value("uri") + ", page: " + JSON.stringify(page))

framework/uicomponents/qml/MuseScore/UiComponents/SeparatorLine.qml

@@ -1,4 +1,6 @@
-import QtQuick 2.0
+import QtQuick 2.9
+import QtQuick.Layouts 1.3
+
 import MuseScore.Ui 1.0
 
 Rectangle {
@@ -13,31 +15,21 @@ Rectangle {
             name: "HORIZONTAL"
             when: orientation == Qt.Horizontal
 
-            AnchorChanges {
-                target: root
-                anchors.left: parent.left
-                anchors.right: parent.right
-            }
-
             PropertyChanges {
                 target: root
                 height: 1
+                Layout.fillWidth: true
             }
         },
 
         State {
             name: "VERTICAL"
             when: orientation == Qt.Vertical
 
-            AnchorChanges {
-                target: root
-                anchors.top: parent.top
-                anchors.bottom: parent.bottom
-            }
-
             PropertyChanges {
                 target: root
                 width: 1
+                Layout.fillHeight: true
             }
         }
     ]

framework/uicomponents/qml/MuseScore/UiComponents/TabPanel.qml

@@ -23,7 +23,7 @@ TabView {
         Connections {
             target: root
 
-            onCurrentIndexChanged: {
+            function onCurrentIndexChanged(currentIndex) {
                 if (currentIndex < 0)
                     return
 

libmscore/ambitus.h

@@ -95,9 +95,9 @@ class Ambitus final : public Element
     QString   accessibleInfo() const override;
 
     // properties
-    QVariant getProperty(Pid) const;
-    bool setProperty(Pid propertyId, const QVariant&);
-    QVariant propertyDefault(Pid id) const;
+    QVariant getProperty(Pid) const override;
+    bool setProperty(Pid propertyId, const QVariant&) override;
+    QVariant propertyDefault(Pid id) const override;
 
     Element* nextSegmentElement() override;
     Element* prevSegmentElement() override;

libmscore/arpeggio.h

@@ -76,7 +76,7 @@ class Arpeggio final : public Element
 
     int span() const { return _span; }
     void setSpan(int val) { _span = val; }
-    void setHeight(qreal);
+    void setHeight(qreal) override;
 
     qreal userLen1() const { return _userLen1; }
     qreal userLen2() const { return _userLen2; }

libmscore/articulation.h

@@ -70,7 +70,7 @@ class Articulation final : public Element
     MScore::OrnamentStyle _ornamentStyle;       // for use in ornaments such as trill
     bool _playArticulation;
 
-    void draw(QPainter*) const;
+    void draw(QPainter*) const override;
 
     enum class AnchorGroup {
         ARTICULATION,
@@ -92,7 +92,7 @@ class Articulation final : public Element
     SymId symId() const { return _symId; }
     void setSymId(SymId id);
     int subtype() const override;
-    QString userName() const;
+    QString userName() const override;
     const char* articulationName() const;    // type-name of articulation; used for midi rendering
     static const char* symId2ArticulationName(SymId symId);
 

libmscore/barline.h

@@ -68,7 +68,7 @@ class BarLine final : public Element
     void drawTips(QPainter* painter, bool reversed, qreal x) const;
     bool isTop() const;
     bool isBottom() const;
-    void drawEditMode(QPainter*, EditData&);
+    void drawEditMode(QPainter*, EditData&) override;
 
 public:
     BarLine(Score* s = 0);
@@ -138,7 +138,7 @@ class BarLine final : public Element
     bool setProperty(Pid propertyId, const QVariant&) override;
     QVariant propertyDefault(Pid propertyId) const override;
     Pid propertyId(const QStringRef& xmlName) const override;
-    void undoChangeProperty(Pid id, const QVariant&, PropertyFlags ps);
+    void undoChangeProperty(Pid id, const QVariant&, PropertyFlags ps) override;
     using ScoreElement::undoChangeProperty;
 
     static qreal layoutWidth(Score*, BarLineType);