From a0c393a01235c1b2a7777a96039b38d19d5fe88b Mon Sep 17 00:00:00 2001 From: James Crook Date: Fri, 9 Feb 2018 20:38:53 +0000 Subject: [PATCH] Fix GetInfo: Commands (Automated type matching matched 'the wrong thing'). --- src/commands/CommandTargets.cpp | 6 +++--- src/commands/CommandTargets.h | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/commands/CommandTargets.cpp b/src/commands/CommandTargets.cpp index edf773123..74a111f87 100644 --- a/src/commands/CommandTargets.cpp +++ b/src/commands/CommandTargets.cpp @@ -59,7 +59,7 @@ void CommandMessageTarget::AddItem(const wxString &value, const wxString &name){ Update( wxString::Format( "%s%s%s\"%s\"", (mCounts.Last()>0)?", ":"", name, !name.IsEmpty()?":":"",value)); mCounts.Last() += 1; } -void CommandMessageTarget::AddItem(const bool value, const wxString &name){ +void CommandMessageTarget::AddBool(const bool value, const wxString &name){ Update( wxString::Format( "%s%s%s%s", (mCounts.Last()>0)?", ":"", name, !name.IsEmpty()?":":"",value?"True":"False")); mCounts.Last() += 1; } @@ -110,7 +110,7 @@ void LispyCommandMessageTarget::AddItem(const wxString &value, const wxString &n Update( wxString::Format( "%s%s%s\"%s\"", (mCounts.Last()>0)?", ":"", name, !name.IsEmpty()?",":"",value)); mCounts.Last() += 1; } -void LispyCommandMessageTarget::AddItem(const bool value, const wxString &name){ +void LispyCommandMessageTarget::AddBool(const bool value, const wxString &name){ Update( wxString::Format( "%s%s%s%s", (mCounts.Last()>0)?", ":"", name, !name.IsEmpty()?",":"",value?"True":"False")); mCounts.Last() += 1; } @@ -167,7 +167,7 @@ void BriefCommandMessageTarget::AddItem(const wxString &value, const wxString &n Update( wxString::Format( "%s\"%s\"", (mCounts.Last()>0)?" ":"",value)); mCounts.Last() += 1; } -void BriefCommandMessageTarget::AddItem(const bool value, const wxString &name){ +void BriefCommandMessageTarget::AddBool(const bool value, const wxString &name){ if( mCounts.GetCount() <= 3 ) Update( wxString::Format( "%s%s", (mCounts.Last()>0)?" ":"",value?"True":"False")); mCounts.Last() += 1; diff --git a/src/commands/CommandTargets.h b/src/commands/CommandTargets.h index 2560f9376..d1d1f9535 100644 --- a/src/commands/CommandTargets.h +++ b/src/commands/CommandTargets.h @@ -83,7 +83,7 @@ public: virtual void StartStruct(); virtual void EndStruct(); virtual void AddItem(const wxString &value , const wxString &name="" ); - virtual void AddItem(const bool value , const wxString &name="" ); + virtual void AddBool(const bool value , const wxString &name="" ); virtual void AddItem(const double value , const wxString &name="" ); virtual void AddField( const wxString &name="" ); virtual void Flush(); @@ -101,7 +101,7 @@ public: virtual void StartStruct(){ mTarget.StartStruct();}; virtual void EndStruct(){ mTarget.EndStruct();}; virtual void AddItem(const wxString &value , const wxString &name="" ){ mTarget.AddItem(value,name);}; - virtual void AddItem(const bool value , const wxString &name="" ){ mTarget.AddItem(value,name);}; + virtual void AddBool(const bool value , const wxString &name="" ){ mTarget.AddBool(value,name);}; virtual void AddItem(const double value , const wxString &name="" ){ mTarget.AddItem(value,name);}; virtual void AddField( const wxString &name="" ){ mTarget.AddField(name);}; virtual void Flush(){ mTarget.Flush();}; @@ -117,7 +117,7 @@ public: virtual void StartStruct() override; virtual void EndStruct() override; virtual void AddItem(const wxString &value , const wxString &name="" )override; - virtual void AddItem(const bool value , const wxString &name="" )override; + virtual void AddBool(const bool value , const wxString &name="" )override; virtual void AddItem(const double value , const wxString &name="" )override; virtual void AddField( const wxString &name="" )override; }; @@ -131,7 +131,7 @@ public: virtual void StartStruct() override; virtual void EndStruct() override; virtual void AddItem(const wxString &value , const wxString &name="" )override; - virtual void AddItem(const bool value , const wxString &name="" )override; + virtual void AddBool(const bool value , const wxString &name="" )override; virtual void AddItem(const double value , const wxString &name="" )override; virtual void AddField( const wxString &name="" )override; }; @@ -333,7 +333,7 @@ public: if (mStatusTarget) mStatusTarget->AddItem( value, name ); } - void AddItem(const bool value , const wxString &name="" ) + void AddBool(const bool value , const wxString &name="" ) { if (mStatusTarget) mStatusTarget->AddItem( value, name );