audacia
/
audacia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Shuttle and ShuttleParams class hierarchies are separate... 

... despite the name similarities, there was no commonality of purpose.

We can use multiple inheritance from the two, treating each as a mixin, if
need arises.
This commit is contained in:
Paul Licameli 2019-02-05 15:45:49 -05:00
parent 0c24d0d47a
commit 4c3140ae05
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Shuttle.cpp
View File

@ -306,11 +306,6 @@ bool ShuttleCli::ExchangeWithMaster(const wxString & Name)
}
bool ShuttleParams::ExchangeWithMaster(const wxString & WXUNUSED(Name))
{
return true;
}
#ifdef _MSC_VER
// If this is compiled with MSVC (Visual Studio)
#pragma warning( push )

4
src/Shuttle.h
View File

@ -55,8 +55,9 @@ class CommandParameters;
/**************************************************************************//**
\brief Shuttle that deals with parameters. This is a base class with lots of
virtual functions that do nothing by default.
Unrelated to class Shuttle.
********************************************************************************/
class ShuttleParams /* not final */ : public Shuttle
class ShuttleParams /* not final */
{
public:
wxString mParams;
@ -64,7 +65,6 @@ public:
CommandParameters * mpEap;
ShuttleParams() { mpEap = NULL; pOptionalFlag = NULL; }
virtual ~ShuttleParams() {}
bool ExchangeWithMaster(const wxString & Name) override;
bool ShouldSet();
virtual ShuttleParams & Optional( bool & WXUNUSED(var) ){ pOptionalFlag = NULL;return *this;};
virtual ShuttleParams & OptionalY( bool & var ){ return Optional( var );};