Skip to content

Commit

Permalink
Renamed class
Browse files Browse the repository at this point in the history
  • Loading branch information
oleg68 committed Jan 11, 2025
1 parent f08b868 commit 3b27d23
Show file tree
Hide file tree
Showing 16 changed files with 5,452 additions and 5,251 deletions.
10,629 changes: 5,415 additions & 5,214 deletions ide-projects/NetBeans12/nbproject/configurations.xml

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/grandorgue/control/GOButtonControl.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright 2006 Milan Digital Audio LLC
* Copyright 2009-2024 GrandOrgue contributors (see AUTHORS)
* Copyright 2009-2025 GrandOrgue contributors (see AUTHORS)
* License GPL-2.0 or later
* (https://www.gnu.org/licenses/old-licenses/gpl-2.0.html).
*/
Expand All @@ -19,7 +19,7 @@ GOButtonControl::GOButtonControl(
GOMidiReceiverType midi_type,
bool pushbutton,
bool isPiston)
: GOMidiConfigurator(organModel),
: GOMidiObject(organModel),
r_MidiMap(organModel.GetConfig().GetMidiMap()),
r_OrganModel(organModel),
m_midi(organModel, midi_type),
Expand Down
2 changes: 1 addition & 1 deletion src/grandorgue/control/GOButtonControl.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class GOButtonControl : public GOControl,
private GOEventHandler,
public GOSaveableObject,
public GOSoundStateHandler,
public GOMidiConfigurator {
public GOMidiObject {
private:
GOMidiMap &r_MidiMap;

Expand Down
4 changes: 2 additions & 2 deletions src/grandorgue/control/GOLabelControl.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright 2006 Milan Digital Audio LLC
* Copyright 2009-2023 GrandOrgue contributors (see AUTHORS)
* Copyright 2009-2025 GrandOrgue contributors (see AUTHORS)
* License GPL-2.0 or later
* (https://www.gnu.org/licenses/old-licenses/gpl-2.0.html).
*/
Expand All @@ -14,7 +14,7 @@
#include "config/GOConfig.h"

GOLabelControl::GOLabelControl(GOOrganController *organController)
: GOMidiConfigurator(*organController),
: GOMidiObject(*organController),
m_Name(),
m_Content(),
m_OrganController(organController),
Expand Down
2 changes: 1 addition & 1 deletion src/grandorgue/control/GOLabelControl.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class GOOrganController;
class GOLabelControl : public GOControl,
private GOSaveableObject,
private GOSoundStateHandler,
public GOMidiConfigurator {
public GOMidiObject {
protected:
wxString m_Name;
wxString m_Content;
Expand Down
20 changes: 10 additions & 10 deletions src/grandorgue/gui/dialogs/GOMidiListDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ GOMidiListDialog::GOMidiListDialog(
GODocumentBase *doc,
wxWindow *parent,
GODialogSizeSet &dialogSizes,
const std::vector<GOMidiConfigurator *> &midi_elements)
const std::vector<GOMidiObject *> &midi_elements)
: GOSimpleDialog(
parent,
wxT("MIDI Objects"),
Expand Down Expand Up @@ -70,7 +70,7 @@ GOMidiListDialog::GOMidiListDialog(
topSizer->Add(buttons, 0, wxALIGN_RIGHT | wxALL, 1);

for (unsigned i = 0; i < midi_elements.size(); i++) {
GOMidiConfigurator *obj = midi_elements[i];
GOMidiObject *obj = midi_elements[i];

m_Objects->InsertItem(i, obj->GetMidiType());
m_Objects->SetItemPtrData(i, (wxUIntPtr)obj);
Expand All @@ -87,14 +87,14 @@ GOMidiListDialog::GOMidiListDialog(
GOMidiListDialog::~GOMidiListDialog() {}

void GOMidiListDialog::OnButton(wxCommandEvent &event) {
GOMidiConfigurator *obj = (GOMidiConfigurator *)m_Objects->GetItemData(
m_Objects->GetFirstSelected());
GOMidiObject *obj
= (GOMidiObject *)m_Objects->GetItemData(m_Objects->GetFirstSelected());
obj->TriggerElementActions(event.GetId() - ID_BUTTON);
}

void GOMidiListDialog::OnStatus(wxCommandEvent &event) {
GOMidiConfigurator *obj = (GOMidiConfigurator *)m_Objects->GetItemData(
m_Objects->GetFirstSelected());
GOMidiObject *obj
= (GOMidiObject *)m_Objects->GetItemData(m_Objects->GetFirstSelected());
wxString status = obj->GetElementStatus();
GOMessageBox(
wxString::Format(_("Status: %s"), status),
Expand All @@ -105,8 +105,8 @@ void GOMidiListDialog::OnStatus(wxCommandEvent &event) {
void GOMidiListDialog::OnObjectClick(wxListEvent &event) {
m_Edit->Enable();
m_Status->Enable();
GOMidiConfigurator *obj = (GOMidiConfigurator *)m_Objects->GetItemData(
m_Objects->GetFirstSelected());
GOMidiObject *obj
= (GOMidiObject *)m_Objects->GetItemData(m_Objects->GetFirstSelected());
std::vector<wxString> actions = obj->GetElementActions();
for (unsigned i = 0; i < m_Buttons.size(); i++)
if (i < actions.size()) {
Expand All @@ -118,8 +118,8 @@ void GOMidiListDialog::OnObjectClick(wxListEvent &event) {
}

void GOMidiListDialog::OnObjectDoubleClick(wxListEvent &event) {
GOMidiConfigurator *obj = (GOMidiConfigurator *)m_Objects->GetItemData(
m_Objects->GetFirstSelected());
GOMidiObject *obj
= (GOMidiObject *)m_Objects->GetItemData(m_Objects->GetFirstSelected());
obj->ShowConfigDialog();
}

Expand Down
6 changes: 3 additions & 3 deletions src/grandorgue/gui/dialogs/GOMidiListDialog.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright 2006 Milan Digital Audio LLC
* Copyright 2009-2023 GrandOrgue contributors (see AUTHORS)
* Copyright 2009-2025 GrandOrgue contributors (see AUTHORS)
* License GPL-2.0 or later
* (https://www.gnu.org/licenses/old-licenses/gpl-2.0.html).
*/
Expand All @@ -17,7 +17,7 @@ class wxButton;
class wxListEvent;
class wxListView;

class GOMidiConfigurator;
class GOMidiObject;

class GOMidiListDialog : public GOSimpleDialog, public GOView {
private:
Expand Down Expand Up @@ -45,7 +45,7 @@ class GOMidiListDialog : public GOSimpleDialog, public GOView {
GODocumentBase *doc,
wxWindow *parent,
GODialogSizeSet &dialogSizes,
const std::vector<GOMidiConfigurator *> &midi_elements);
const std::vector<GOMidiObject *> &midi_elements);
~GOMidiListDialog();

DECLARE_EVENT_TABLE()
Expand Down
2 changes: 1 addition & 1 deletion src/grandorgue/midi/objects/GOMidiObject.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

#include "midi/dialog-creator/GOMidiDialogCreator.h"

void GOMidiConfigurator::ShowConfigDialog() {
void GOMidiObject::ShowConfigDialog() {
const wxString &midiTypeCode = GetMidiTypeCode();
const wxString &midiName = GetMidiName();
wxString title
Expand Down
6 changes: 3 additions & 3 deletions src/grandorgue/midi/objects/GOMidiObject.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class GOMidiReceiverBase;
class GOMidiSender;
class GOMidiShortcutReceiver;

class GOMidiConfigurator {
class GOMidiObject {
private:
GOMidiDialogCreator &r_DialogCreator;

Expand All @@ -28,10 +28,10 @@ class GOMidiConfigurator {
virtual GOMidiSender *GetDivision() { return nullptr; }

public:
GOMidiConfigurator(GOMidiDialogCreator &dialogCreator)
GOMidiObject(GOMidiDialogCreator &dialogCreator)
: r_DialogCreator(dialogCreator) {}

virtual ~GOMidiConfigurator() {}
virtual ~GOMidiObject() {}

virtual const wxString &GetMidiTypeCode() const = 0;
virtual const wxString &GetMidiType() const = 0;
Expand Down
4 changes: 2 additions & 2 deletions src/grandorgue/model/GOEnclosure.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright 2006 Milan Digital Audio LLC
* Copyright 2009-2024 GrandOrgue contributors (see AUTHORS)
* Copyright 2009-2025 GrandOrgue contributors (see AUTHORS)
* License GPL-2.0 or later
* (https://www.gnu.org/licenses/old-licenses/gpl-2.0.html).
*/
Expand All @@ -16,7 +16,7 @@
#include "GOOrganModel.h"

GOEnclosure::GOEnclosure(GOOrganModel &organModel)
: GOMidiConfigurator(organModel),
: GOMidiObject(organModel),
r_OrganModel(organModel),
r_MidiMap(organModel.GetConfig().GetMidiMap()),
m_midi(organModel, MIDI_RECV_ENCLOSURE),
Expand Down
2 changes: 1 addition & 1 deletion src/grandorgue/model/GOEnclosure.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class GOEnclosure : public GOControl,
private GOEventHandler,
private GOSaveableObject,
private GOSoundStateHandler,
public GOMidiConfigurator {
public GOMidiObject {
private:
GOOrganModel &r_OrganModel;
GOMidiMap &r_MidiMap;
Expand Down
10 changes: 5 additions & 5 deletions src/grandorgue/model/GOEventHandlerList.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright 2006 Milan Digital Audio LLC
* Copyright 2009-2024 GrandOrgue contributors (see AUTHORS)
* Copyright 2009-2025 GrandOrgue contributors (see AUTHORS)
* License GPL-2.0 or later
* (https://www.gnu.org/licenses/old-licenses/gpl-2.0.html).
*/
Expand All @@ -17,7 +17,7 @@ class GOCombinationButtonSet;
class GOControl;
class GOControlChangedHandler;
class GOEventHandler;
class GOMidiConfigurator;
class GOMidiObject;
class GOReferencingObject;
class GOSoundStateHandler;
class GOSaveableObject;
Expand Down Expand Up @@ -61,7 +61,7 @@ class GOEventHandlerList {
UPVector<GOReferencingObject> m_ReferencingObjects;
UPVector<GOCombinationButtonSet> m_CombinationButtonSets;
UPVector<GOControlChangedHandler> m_ControlChangedHandlers;
UPVector<GOMidiConfigurator> m_MidiConfigurators;
UPVector<GOMidiObject> m_MidiConfigurators;
UPVector<GOEventHandler> m_MidiEventHandlers;
UPVector<GOSoundStateHandler> m_SoundStateHandlers;
UPVector<GOSaveableObject> m_SaveableObjects;
Expand All @@ -77,7 +77,7 @@ class GOEventHandlerList {
const {
return m_CombinationButtonSets.AsVector();
}
const std::vector<GOMidiConfigurator *> &GetMidiConfigurators() const {
const std::vector<GOMidiObject *> &GetMidiConfigurators() const {
return m_MidiConfigurators.AsVector();
}
const std::vector<GOEventHandler *> &GetMidiEventHandlers() const {
Expand Down Expand Up @@ -112,7 +112,7 @@ class GOEventHandlerList {
m_ControlChangedHandlers.Remove(handler);
}

void RegisterMidiConfigurator(GOMidiConfigurator *obj) {
void RegisterMidiConfigurator(GOMidiObject *obj) {
m_MidiConfigurators.Add(obj);
}

Expand Down
4 changes: 2 additions & 2 deletions src/grandorgue/model/GOManual.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright 2006 Milan Digital Audio LLC
* Copyright 2009-2024 GrandOrgue contributors (see AUTHORS)
* Copyright 2009-2025 GrandOrgue contributors (see AUTHORS)
* License GPL-2.0 or later
* (https://www.gnu.org/licenses/old-licenses/gpl-2.0.html).
*/
Expand All @@ -21,7 +21,7 @@
#include "GOTremulant.h"

GOManual::GOManual(GOOrganModel &organModel)
: GOMidiConfigurator(organModel),
: GOMidiObject(organModel),
r_OrganModel(organModel),
r_MidiMap(organModel.GetConfig().GetMidiMap()),
m_group(wxT("---")),
Expand Down
2 changes: 1 addition & 1 deletion src/grandorgue/model/GOManual.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class GOManual : public GOControl,
private GOCombinationButtonSet,
private GOSaveableObject,
private GOSoundStateHandler,
public GOMidiConfigurator {
public GOMidiObject {
private:
GOOrganModel &r_OrganModel;
GOMidiMap &r_MidiMap;
Expand Down
4 changes: 2 additions & 2 deletions src/grandorgue/model/GORank.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright 2006 Milan Digital Audio LLC
* Copyright 2009-2024 GrandOrgue contributors (see AUTHORS)
* Copyright 2009-2025 GrandOrgue contributors (see AUTHORS)
* License GPL-2.0 or later
* (https://www.gnu.org/licenses/old-licenses/gpl-2.0.html).
*/
Expand All @@ -21,7 +21,7 @@
#include "GOWindchest.h"

GORank::GORank(GOOrganModel &organModel)
: GOMidiConfigurator(organModel),
: GOMidiObject(organModel),
r_OrganModel(organModel),
r_MidiMap(organModel.GetConfig().GetMidiMap()),
m_Name(),
Expand Down
2 changes: 1 addition & 1 deletion src/grandorgue/model/GORank.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class GOStop;
class GOTemperament;

class GORank : private GOSaveableObject,
public GOMidiConfigurator,
public GOMidiObject,
private GOSoundStateHandler {
private:
GOOrganModel &r_OrganModel;
Expand Down

0 comments on commit 3b27d23

Please sign in to comment.