From 0c10bab41296264632f4cf2a3fedec472332a67e Mon Sep 17 00:00:00 2001 From: Ian McInerney Date: Mon, 6 Jan 2020 19:55:39 +0000 Subject: [PATCH] Add base class constructors to some copy constructors --- eeschema/sch_validators.cpp | 15 +++++++++------ include/tool/selection.h | 10 +++++----- include/validators.h | 3 +-- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/eeschema/sch_validators.cpp b/eeschema/sch_validators.cpp index 16a2328cbf..47158cb262 100644 --- a/eeschema/sch_validators.cpp +++ b/eeschema/sch_validators.cpp @@ -163,20 +163,23 @@ bool SCH_FIELD_VALIDATOR::Validate( wxWindow *aParent ) } -SCH_NETNAME_VALIDATOR::SCH_NETNAME_VALIDATOR( wxString *aVal ) : - wxValidator(), m_allowSpaces( false ) +SCH_NETNAME_VALIDATOR::SCH_NETNAME_VALIDATOR( wxString *aVal ) + : wxValidator(), + m_allowSpaces( false ) { } -SCH_NETNAME_VALIDATOR::SCH_NETNAME_VALIDATOR( const SCH_NETNAME_VALIDATOR& aValidator ) : - m_allowSpaces( aValidator.m_allowSpaces ) +SCH_NETNAME_VALIDATOR::SCH_NETNAME_VALIDATOR( const SCH_NETNAME_VALIDATOR& aValidator ) + : wxValidator(), + m_allowSpaces( aValidator.m_allowSpaces ) { } -SCH_NETNAME_VALIDATOR::SCH_NETNAME_VALIDATOR( bool aAllowSpaces ) : - wxValidator(), m_allowSpaces( aAllowSpaces ) +SCH_NETNAME_VALIDATOR::SCH_NETNAME_VALIDATOR( bool aAllowSpaces ) + : wxValidator(), + m_allowSpaces( aAllowSpaces ) { } diff --git a/include/tool/selection.h b/include/tool/selection.h index ae97bffdbb..991e59eb37 100644 --- a/include/tool/selection.h +++ b/include/tool/selection.h @@ -35,12 +35,12 @@ class SELECTION : public KIGFX::VIEW_GROUP { public: - SELECTION() + SELECTION() : KIGFX::VIEW_GROUP::VIEW_GROUP() { m_isHover = false; } - SELECTION( const SELECTION& aOther ) + SELECTION( const SELECTION& aOther ) : KIGFX::VIEW_GROUP::VIEW_GROUP() { m_items = aOther.m_items; m_isHover = aOther.m_isHover; @@ -131,7 +131,7 @@ public: { return m_items; } - + /// Returns the center point of the selection area bounding box. virtual VECTOR2I GetCenter() const { @@ -165,7 +165,7 @@ public: return bbox; } - + virtual EDA_ITEM* GetTopLeftItem( bool onlyModules = false ) const { return nullptr; @@ -258,7 +258,7 @@ public: bool AreAllItemsIdentical() const { return ( std::all_of( m_items.begin() + 1, m_items.end(), - [&]( const EDA_ITEM* r ) + [&]( const EDA_ITEM* r ) { return r->Type() == m_items.front()->Type(); } ) ); diff --git a/include/validators.h b/include/validators.h index 5d7e1f6322..f9790b53d2 100644 --- a/include/validators.h +++ b/include/validators.h @@ -137,9 +137,8 @@ public: compileRegEx( aRegEx, aFlags ); } - REGEX_VALIDATOR( const REGEX_VALIDATOR& aOther ) + REGEX_VALIDATOR( const REGEX_VALIDATOR& aOther ) : wxTextValidator( aOther ) { - wxValidator::Copy( aOther ); compileRegEx( aOther.m_regExString, aOther.m_regExFlags ); }