diff --git a/src/Shuttle.cpp b/src/Shuttle.cpp index 4b15f551a..c4fa4c7d1 100644 --- a/src/Shuttle.cpp +++ b/src/Shuttle.cpp @@ -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 ) diff --git a/src/Shuttle.h b/src/Shuttle.h index be6436e4d..1ed4175ed 100644 --- a/src/Shuttle.h +++ b/src/Shuttle.h @@ -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 );};