Fixed override warnings in macOS build (GrandOrgue#1999)

larspalo · Sep 6, 2024 · 3d49075 · 3d49075
1 parent f495bc8
commit 3d49075
Show file tree

Hide file tree

Showing 31 changed files with 130 additions and 124 deletions.
diff --git a/src/grandorgue/GOApp.cpp b/src/grandorgue/GOApp.cpp
@@ -174,10 +174,12 @@ bool GOApp::OnInit() {
   return true;
 }
 
+#ifdef __WXMAC__
 void GOApp::MacOpenFile(const wxString &filename) {
   if (m_Frame)
     m_Frame->SendLoadFile(filename);
 }
+#endif
 
 int GOApp::OnRun() { return wxApp::OnRun(); }
 

diff --git a/src/grandorgue/GOApp.h b/src/grandorgue/GOApp.h
@@ -33,12 +33,14 @@ class GOApp : public wxApp {
 private:
   bool m_Restart;
 
-  virtual void MacOpenFile(const wxString &fileName);
-  void OnInitCmdLine(wxCmdLineParser &parser);
-  bool OnCmdLineParsed(wxCmdLineParser &parser);
-  bool OnInit();
-  int OnRun();
-  int OnExit();
+#ifdef __WXMAC__
+  virtual void MacOpenFile(const wxString &fileName) override;
+#endif
+  void OnInitCmdLine(wxCmdLineParser &parser) override;
+  bool OnCmdLineParsed(wxCmdLineParser &parser) override;
+  bool OnInit() override;
+  int OnRun() override;
+  int OnExit() override;
   virtual void CleanUp() override;
 
 protected:

diff --git a/src/grandorgue/GOAudioRecorder.h b/src/grandorgue/GOAudioRecorder.h
@@ -1,6 +1,6 @@
 /*
  * Copyright 2006 Milan Digital Audio LLC
- * Copyright 2009-2023 GrandOrgue contributors (see AUTHORS)
+ * Copyright 2009-2024 GrandOrgue contributors (see AUTHORS)
  * License GPL-2.0 or later
  * (https://www.gnu.org/licenses/old-licenses/gpl-2.0.html).
  */
@@ -28,12 +28,12 @@ class GOAudioRecorder : public GOElementCreator, private GOTimerCallback {
   bool m_DoRename;
 
   static const struct ButtonDefinitionEntry m_element_types[];
-  const struct ButtonDefinitionEntry *GetButtonDefinitionList();
+  const struct ButtonDefinitionEntry *GetButtonDefinitionList() override;
 
   void ButtonStateChanged(int id, bool newState) override;
 
   void UpdateDisplay();
-  void HandleTimer();
+  void HandleTimer() override;
 
 public:
   GOAudioRecorder(GOOrganController *organController);
@@ -45,9 +45,9 @@ class GOAudioRecorder : public GOElementCreator, private GOTimerCallback {
   bool IsRecording();
   void StopRecording();
 
-  void Load(GOConfigReader &cfg);
-  GOEnclosure *GetEnclosure(const wxString &name, bool is_panel);
-  GOLabelControl *GetLabelControl(const wxString &name, bool is_panel);
+  void Load(GOConfigReader &cfg) override;
+  GOEnclosure *GetEnclosure(const wxString &name, bool is_panel) override;
+  GOLabelControl *GetLabelControl(const wxString &name, bool is_panel) override;
 };
 
 #endif
diff --git a/src/grandorgue/GODocument.h b/src/grandorgue/GODocument.h
@@ -39,7 +39,7 @@ class GODocument : public GODocumentBase,
 
   GOMidiListener m_listener;
 
-  void OnMidiEvent(const GOMidiEvent &event);
+  void OnMidiEvent(const GOMidiEvent &event) override;
 
   void SyncState();
   void CloseOrgan();

diff --git a/src/grandorgue/GOFrame.h b/src/grandorgue/GOFrame.h
@@ -159,7 +159,7 @@ class GOFrame : public wxFrame,
   void OnMenuOpen(wxMenuEvent &event);
   void OnCloseWindow(wxCloseEvent &event);
 
-  void OnMidiEvent(const GOMidiEvent &event);
+  void OnMidiEvent(const GOMidiEvent &event) override;
 
   void OnUpdateLoaded(wxUpdateUIEvent &event);
   void OnSetTitle(wxCommandEvent &event);

diff --git a/src/grandorgue/GOMetronome.h b/src/grandorgue/GOMetronome.h
@@ -1,6 +1,6 @@
 /*
  * Copyright 2006 Milan Digital Audio LLC
- * Copyright 2009-2023 GrandOrgue contributors (see AUTHORS)
+ * Copyright 2009-2024 GrandOrgue contributors (see AUTHORS)
  * License GPL-2.0 or later
  * (https://www.gnu.org/licenses/old-licenses/gpl-2.0.html).
  */
@@ -36,16 +36,16 @@ class GOMetronome : private GOTimerCallback,
 
   static const struct GOElementCreator::ButtonDefinitionEntry m_element_types[];
   const struct GOElementCreator::ButtonDefinitionEntry *
-  GetButtonDefinitionList();
+  GetButtonDefinitionList() override;
 
-  void HandleTimer();
+  void HandleTimer() override;
 
   void ButtonStateChanged(int id, bool newState) override;
 
-  void AbortPlayback();
-  void PreparePlayback();
+  void AbortPlayback() override;
+  void PreparePlayback() override;
 
-  void Save(GOConfigWriter &cfg);
+  void Save(GOConfigWriter &cfg) override;
 
   void StartTimer();
   void StopTimer();
@@ -57,10 +57,10 @@ class GOMetronome : private GOTimerCallback,
   GOMetronome(GOOrganController *organController);
   virtual ~GOMetronome();
 
-  void Load(GOConfigReader &cfg);
+  void Load(GOConfigReader &cfg) override;
 
-  GOEnclosure *GetEnclosure(const wxString &name, bool is_panel);
-  GOLabelControl *GetLabelControl(const wxString &name, bool is_panel);
+  GOEnclosure *GetEnclosure(const wxString &name, bool is_panel) override;
+  GOLabelControl *GetLabelControl(const wxString &name, bool is_panel) override;
 };
 
 #endif
diff --git a/src/grandorgue/combinations/GOSetter.h b/src/grandorgue/combinations/GOSetter.h
@@ -84,13 +84,13 @@ class GOSetter : private GOSoundStateHandler,
   void Crescendo(int pos, bool force = false);
 
   static const struct ButtonDefinitionEntry m_element_types[];
-  const struct ButtonDefinitionEntry *GetButtonDefinitionList();
+  const struct ButtonDefinitionEntry *GetButtonDefinitionList() override;
 
   void ButtonStateChanged(int id, bool newState) override;
 
   void ControlChanged(GOControl *control) override;
 
-  void PreparePlayback();
+  void PreparePlayback() override;
 
   /**
    * Called after at least one combination is changed
@@ -153,10 +153,10 @@ class GOSetter : private GOSoundStateHandler,
    */
   void ToYaml(YAML::Node &yamlNode) const override;
   void FromYaml(const YAML::Node &yamlNode) override;
-  void Load(GOConfigReader &cfg);
-  void Save(GOConfigWriter &cfg);
-  GOEnclosure *GetEnclosure(const wxString &name, bool is_panel);
-  GOLabelControl *GetLabelControl(const wxString &name, bool is_panel);
+  void Load(GOConfigReader &cfg) override;
+  void Save(GOConfigWriter &cfg) override;
+  GOEnclosure *GetEnclosure(const wxString &name, bool is_panel) override;
+  GOLabelControl *GetLabelControl(const wxString &name, bool is_panel) override;
 
   /**
    * Called from GOOrganController after loading the initial preset and after

diff --git a/src/grandorgue/combinations/control/GODivisionalButtonControl.h b/src/grandorgue/combinations/control/GODivisionalButtonControl.h
@@ -43,8 +43,8 @@ class GODivisionalButtonControl : public GOPushbuttonControl {
 
   void Load(GOConfigReader &cfg, const wxString &group);
 
-  void LoadCombination(GOConfigReader &cfg);
-  void Save(GOConfigWriter &cfg);
+  void LoadCombination(GOConfigReader &cfg) override;
+  void Save(GOConfigWriter &cfg) override;
 
   void Push() override;
 };

diff --git a/src/grandorgue/combinations/model/GODivisionalCombination.h b/src/grandorgue/combinations/model/GODivisionalCombination.h
@@ -1,6 +1,6 @@
 /*
  * Copyright 2006 Milan Digital Audio LLC
- * Copyright 2009-2023 GrandOrgue contributors (see AUTHORS)
+ * Copyright 2009-2024 GrandOrgue contributors (see AUTHORS)
  * License GPL-2.0 or later
  * (https://www.gnu.org/licenses/old-licenses/gpl-2.0.html).
  */
@@ -27,7 +27,7 @@ class GODivisionalCombination : public GOCombination {
   // It is not registered as saveable object because
   // GOdivisionalSetter::LoadCombination creates the combinations dynamically
   void LoadCombinationInt(GOConfigReader &cfg, GOSettingType srcType) override;
-  void SaveInt(GOConfigWriter &cfg);
+  void SaveInt(GOConfigWriter &cfg) override;
 
   void PutElementToYamlMap(
     const GOCombinationDefinition::Element &e,

diff --git a/src/grandorgue/control/GOButtonControl.h b/src/grandorgue/control/GOButtonControl.h
@@ -47,14 +47,14 @@ class GOButtonControl : public GOControl,
   bool m_ReadOnly;
   bool m_IsPiston;
 
-  void ProcessMidi(const GOMidiEvent &event);
-  void HandleKey(int key);
+  void ProcessMidi(const GOMidiEvent &event) override;
+  void HandleKey(int key) override;
 
-  void Save(GOConfigWriter &cfg);
+  void Save(GOConfigWriter &cfg) override;
 
-  void AbortPlayback();
-  void PreparePlayback();
-  void PrepareRecording();
+  void AbortPlayback() override;
+  void PreparePlayback() override;
+  void PrepareRecording() override;
 
   GOMidiReceiverBase *GetMidiReceiver() override {
     return IsReadOnly() ? nullptr : &m_midi;
@@ -91,9 +91,9 @@ class GOButtonControl : public GOControl,
 
   const wxString &GetMidiName() const override { return GetName(); }
 
-  wxString GetElementStatus();
-  std::vector<wxString> GetElementActions();
-  void TriggerElementActions(unsigned no);
+  wxString GetElementStatus() override;
+  std::vector<wxString> GetElementActions() override;
+  void TriggerElementActions(unsigned no) override;
 };
 
 #endif
diff --git a/src/grandorgue/control/GOCallbackButtonControl.h b/src/grandorgue/control/GOCallbackButtonControl.h
@@ -1,6 +1,6 @@
 /*
  * Copyright 2006 Milan Digital Audio LLC
- * Copyright 2009-2023 GrandOrgue contributors (see AUTHORS)
+ * Copyright 2009-2024 GrandOrgue contributors (see AUTHORS)
  * License GPL-2.0 or later
  * (https://www.gnu.org/licenses/old-licenses/gpl-2.0.html).
  */
@@ -22,8 +22,8 @@ class GOCallbackButtonControl : public GOButtonControl {
     GOButtonCallback *callback,
     bool isPushbutton,
     bool isPiston = false);
-  void Push(void);
-  void Set(bool on);
+  void Push(void) override;
+  void Set(bool on) override;
 
   const wxString &GetMidiTypeCode() const override;
   const wxString &GetMidiType() const override;

diff --git a/src/grandorgue/control/GOLabelControl.h b/src/grandorgue/control/GOLabelControl.h
@@ -32,11 +32,11 @@ class GOLabelControl : public GOControl,
   GOOrganController *m_OrganController;
   GOMidiSender m_sender;
 
-  void Save(GOConfigWriter &cfg);
+  void Save(GOConfigWriter &cfg) override;
 
-  void AbortPlayback();
-  void PreparePlayback();
-  void PrepareRecording();
+  void AbortPlayback() override;
+  void PreparePlayback() override;
+  void PrepareRecording() override;
 
 public:
   GOLabelControl(GOOrganController *organController);
@@ -52,9 +52,9 @@ class GOLabelControl : public GOControl,
   const wxString &GetMidiName() const override { return GetName(); }
   GOMidiSender *GetMidiSender() override { return &m_sender; }
 
-  wxString GetElementStatus();
-  std::vector<wxString> GetElementActions();
-  void TriggerElementActions(unsigned no);
+  wxString GetElementStatus() override;
+  std::vector<wxString> GetElementActions() override;
+  void TriggerElementActions(unsigned no) override;
 };
 
 #endif
diff --git a/src/grandorgue/control/GOPistonControl.h b/src/grandorgue/control/GOPistonControl.h
@@ -25,7 +25,7 @@ class GOPistonControl : public GOPushbuttonControl,
 public:
   GOPistonControl(GOOrganModel &organModel);
   void Load(GOConfigReader &cfg, wxString group);
-  void Push();
+  void Push() override;
 
   const wxString &GetMidiTypeCode() const override;
   const wxString &GetMidiType() const override;

diff --git a/src/grandorgue/dialogs/midi-event/GOMidiEventRecvTab.h b/src/grandorgue/dialogs/midi-event/GOMidiEventRecvTab.h
@@ -1,6 +1,6 @@
 /*
  * Copyright 2006 Milan Digital Audio LLC
- * Copyright 2009-2023 GrandOrgue contributors (see AUTHORS)
+ * Copyright 2009-2024 GrandOrgue contributors (see AUTHORS)
  * License GPL-2.0 or later
  * (https://www.gnu.org/licenses/old-licenses/gpl-2.0.html).
  */
@@ -93,7 +93,7 @@ class GOMidiEventRecvTab : public wxPanel,
   void OnDeleteClick(wxCommandEvent &event);
   void OnEventChange(wxCommandEvent &event);
   void OnTypeChange(wxCommandEvent &event);
-  void OnMidiEvent(const GOMidiEvent &event);
+  void OnMidiEvent(const GOMidiEvent &event) override;
 
 protected:
   enum {

diff --git a/src/grandorgue/dialogs/settings/GOSettingsMidiDevices.h b/src/grandorgue/dialogs/settings/GOSettingsMidiDevices.h
@@ -1,6 +1,6 @@
 /*
  * Copyright 2006 Milan Digital Audio LLC
- * Copyright 2009-2023 GrandOrgue contributors (see AUTHORS)
+ * Copyright 2009-2024 GrandOrgue contributors (see AUTHORS)
  * License GPL-2.0 or later
  * (https://www.gnu.org/licenses/old-licenses/gpl-2.0.html).
  */
@@ -53,7 +53,7 @@ class SettingsMidiDevices : public wxPanel, GOSettingsPorts {
     const wxString &portName,
     const wxString apiName,
     bool oldEnabled,
-    bool newEnabled);
+    bool newEnabled) override;
   void OnInDevicesClick(wxCommandEvent &event);
   void OnInOutDeviceClick(wxCommandEvent &event);
   void OnInChannelShiftClick(wxCommandEvent &event);

diff --git a/src/grandorgue/dialogs/settings/GOSettingsReverb.h b/src/grandorgue/dialogs/settings/GOSettingsReverb.h
@@ -1,6 +1,6 @@
 /*
  * Copyright 2006 Milan Digital Audio LLC
- * Copyright 2009-2023 GrandOrgue contributors (see AUTHORS)
+ * Copyright 2009-2024 GrandOrgue contributors (see AUTHORS)
  * License GPL-2.0 or later
  * (https://www.gnu.org/licenses/old-licenses/gpl-2.0.html).
  */
@@ -55,7 +55,7 @@ class GOSettingsReverb : public wxPanel {
   void UpdateLimits();
   void UpdateEnabled();
 
-  bool Validate();
+  bool Validate() override;
 
 public:
   GOSettingsReverb(GOConfig &settings, wxWindow *parent);

diff --git a/src/grandorgue/dialogs/settings/GOSettingsTemperaments.h b/src/grandorgue/dialogs/settings/GOSettingsTemperaments.h
@@ -1,6 +1,6 @@
 /*
  * Copyright 2006 Milan Digital Audio LLC
- * Copyright 2009-2023 GrandOrgue contributors (see AUTHORS)
+ * Copyright 2009-2024 GrandOrgue contributors (see AUTHORS)
  * License GPL-2.0 or later
  * (https://www.gnu.org/licenses/old-licenses/gpl-2.0.html).
  */
@@ -37,7 +37,7 @@ class GOSettingsTemperaments : public wxPanel {
   void OnAdd(wxCommandEvent &event);
   void OnDel(wxCommandEvent &event);
 
-  void Update();
+  void Update() override;
 
 public:
   GOSettingsTemperaments(GOConfig &settings, wxWindow *parent);

diff --git a/src/grandorgue/gui/GOGUIControl.h b/src/grandorgue/gui/GOGUIControl.h
@@ -34,7 +34,7 @@ class GOGUIControl : private GOSaveableObject,
   bool m_DrawPending;
 
   void Init(GOConfigReader &cfg, wxString group);
-  void Save(GOConfigWriter &cfg);
+  void Save(GOConfigWriter &cfg) override;
 
   void ControlChanged(GOControl *control) override;
 

diff --git a/src/grandorgue/gui/GOGUILabel.h b/src/grandorgue/gui/GOGUILabel.h
@@ -1,6 +1,6 @@
 /*
  * Copyright 2006 Milan Digital Audio LLC
- * Copyright 2009-2023 GrandOrgue contributors (see AUTHORS)
+ * Copyright 2009-2024 GrandOrgue contributors (see AUTHORS)
  * License GPL-2.0 or later
  * (https://www.gnu.org/licenses/old-licenses/gpl-2.0.html).
  */
@@ -62,12 +62,13 @@ class GOGUILabel : public GOGUIControl {
     unsigned imageno = 1,
     unsigned w = 0,
     unsigned h = 0);
-  void Load(GOConfigReader &cfg, wxString group);
-  void Layout();
+  void Load(GOConfigReader &cfg, wxString group) override;
+  void Layout() override;
 
-  bool HandleMousePress(int x, int y, bool right, GOGUIMouseState &state);
-  void PrepareDraw(double scale, GOBitmap *background);
-  void Draw(GODC &dc);
+  bool HandleMousePress(
+    int x, int y, bool right, GOGUIMouseState &state) override;
+  void PrepareDraw(double scale, GOBitmap *background) override;
+  void Draw(GODC &dc) override;
 };
 
 #endif
diff --git a/src/grandorgue/gui/GOGUIPanel.h b/src/grandorgue/gui/GOGUIPanel.h
@@ -79,7 +79,7 @@ class GOGUIPanel : public GOSizeKeeper {
     wxString name,
     wxString group,
     wxString group_name = wxT(""));
-  void Load(GOConfigReader &cfg, const wxString &group);
+  void Load(GOConfigReader &cfg, const wxString &group) override;
   void Layout();
 
   void SetView(GOGUIPanelView *view);