Beautified code of GOPipe::Load

oleg68 · Feb 14, 2024 · 5b4baac · 5b4baac
1 parent 4c842a1
commit 5b4baac
Show file tree

Hide file tree

Showing 9 changed files with 7,501 additions and 5,854 deletions.
diff --git a/ide-projects/NetBeans12/nbproject/configurations.xml b/ide-projects/NetBeans12/nbproject/configurations.xml
diff --git a/src/grandorgue/CMakeLists.txt b/src/grandorgue/CMakeLists.txt
@@ -160,7 +160,6 @@ model/GOCacheObject.cpp
 model/GOCoupler.cpp
 model/GODivisionalCoupler.cpp
 model/GODrawStop.cpp
-model/GODummyPipe.cpp
 model/GOEnclosure.cpp
 model/GOEventHandlerList.cpp
 model/GOManual.cpp

diff --git a/src/grandorgue/model/GODummyPipe.cpp b/src/grandorgue/model/GODummyPipe.cpp
diff --git a/src/grandorgue/model/GODummyPipe.h b/src/grandorgue/model/GODummyPipe.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).
  */
@@ -12,13 +12,15 @@
 
 class GODummyPipe : public GOPipe {
 private:
-  void VelocityChanged(unsigned velocity, unsigned old_velocity);
+  void VelocityChanged(unsigned velocity, unsigned old_velocity) override {}
 
 public:
   GODummyPipe(
-    GOEventHandlerList *handlerList, GORank *rank, unsigned midi_key_number);
+    GOEventHandlerList *handlerList, GORank *rank, unsigned midi_key_number)
+    : GOPipe(handlerList, rank, midi_key_number) {}
 
-  void Load(GOConfigReader &cfg, wxString group, wxString prefix);
+  void Load(GOConfigReader &cfg, const wxString &group, const wxString &prefix)
+    override {}
 };
 
 #endif
diff --git a/src/grandorgue/model/GOPipe.h b/src/grandorgue/model/GOPipe.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).
  */
@@ -41,7 +41,9 @@ class GOPipe : protected GOSoundStateHandler {
   GOPipe(
     GOEventHandlerList *handlerList, GORank *rank, unsigned midi_key_number);
   virtual ~GOPipe();
-  virtual void Load(GOConfigReader &cfg, wxString group, wxString prefix) = 0;
+  virtual void Load(
+    GOConfigReader &cfg, const wxString &group, const wxString &prefix)
+    = 0;
   /**
    * Called from GORank when a user presses the key
    * @param velocity the velocity value of the midi event

diff --git a/src/grandorgue/model/GOReferencePipe.cpp b/src/grandorgue/model/GOReferencePipe.cpp
@@ -26,7 +26,7 @@ GOReferencePipe::GOReferencePipe(
     m_Filename() {}
 
 void GOReferencePipe::Load(
-  GOConfigReader &cfg, wxString group, wxString prefix) {
+  GOConfigReader &cfg, const wxString &group, const wxString &prefix) {
   SetGroupAndPrefix(group, prefix);
   m_model->RegisterCacheObject(this);
   m_Filename = cfg.ReadStringTrim(ODFSetting, group, prefix);

diff --git a/src/grandorgue/model/GOReferencePipe.h b/src/grandorgue/model/GOReferencePipe.h
@@ -32,7 +32,8 @@ class GOReferencePipe : public GOPipe, private GOCacheObject {
 public:
   GOReferencePipe(GOOrganModel *model, GORank *rank, unsigned midi_key_number);
 
-  void Load(GOConfigReader &cfg, wxString group, wxString prefix);
+  void Load(GOConfigReader &cfg, const wxString &group, const wxString &prefix)
+    override;
 };
 
 #endif
diff --git a/src/grandorgue/model/GOSoundingPipe.cpp b/src/grandorgue/model/GOSoundingPipe.cpp
@@ -220,7 +220,7 @@ void GOSoundingPipe::LoadReleaseFileInfo(
 }
 
 void GOSoundingPipe::Load(
-  GOConfigReader &cfg, wxString group, wxString prefix) {
+  GOConfigReader &cfg, const wxString &group, const wxString &prefix) {
   SetGroupAndPrefix(group, prefix);
   p_OrganModel->RegisterCacheObject(this);
   m_Filename = cfg.ReadStringTrim(ODFSetting, group, prefix);

diff --git a/src/grandorgue/model/GOSoundingPipe.h b/src/grandorgue/model/GOSoundingPipe.h
@@ -113,7 +113,7 @@ class GOSoundingPipe : public GOPipe,
 
 public:
   GOSoundingPipe(
-    GOOrganModel *organController,
+    GOOrganModel *pOrganModel,
     GORank *rank,
     bool percussive,
     int sampler_group_id,
@@ -128,7 +128,8 @@ class GOSoundingPipe : public GOPipe,
     const wxString &group,
     const wxString &prefix,
     const wxString &filename);
-  void Load(GOConfigReader &cfg, wxString group, wxString prefix);
+  void Load(GOConfigReader &cfg, const wxString &group, const wxString &prefix)
+    override;
 };
 
 #endif