properties: post-rebase fixes

common/eda_text.cpp

@@ -630,7 +630,7 @@ static struct EDA_TEXT_DESC
         propMgr.AddProperty( new PROPERTY<EDA_TEXT, wxString>( _( "Text" ),
                     &EDA_TEXT::SetText, &EDA_TEXT::GetText ) );
         propMgr.AddProperty( new PROPERTY<EDA_TEXT, int>( _( "Thickness" ),
-                    &EDA_TEXT::SetThickness, &EDA_TEXT::GetThickness, PROPERTY_DISPLAY::DISTANCE ) );
+                    &EDA_TEXT::SetTextThickness, &EDA_TEXT::GetTextThickness, PROPERTY_DISPLAY::DISTANCE ) );
         propMgr.AddProperty( new PROPERTY<EDA_TEXT, bool>( _( "Italic" ),
                     &EDA_TEXT::SetItalic, &EDA_TEXT::IsItalic ) );
         propMgr.AddProperty( new PROPERTY<EDA_TEXT, bool>( _( "Bold" ),

eeschema/lib_arc.h

@@ -87,7 +87,7 @@ public:
 
     void MoveTo( const wxPoint& aPosition ) override;
 
-    const wxPoint GetPosition() const override { return m_Pos; }
+    wxPoint GetPosition() const override { return m_Pos; }
 
     void MirrorHorizontal( const wxPoint& aCenter ) override;
     void MirrorVertical( const wxPoint& aCenter ) override;

eeschema/lib_bezier.cpp

@@ -351,7 +351,7 @@ void LIB_BEZIER::GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, std::vector<MSG_PANEL_
     aList.emplace_back( _( "Bounding Box" ), msg, BROWN );
 }
 
-const wxPoint LIB_BEZIER::GetPosition() const
+wxPoint LIB_BEZIER::GetPosition() const
 {
     if( !m_PolyPoints.size() )
         return wxPoint(0, 0);

eeschema/lib_bezier.h

@@ -74,7 +74,7 @@ public:
 
     void MoveTo( const wxPoint& aPosition ) override;
 
-    const wxPoint GetPosition() const override;
+    wxPoint GetPosition() const override;
 
     void MirrorHorizontal( const wxPoint& aCenter ) override;
     void MirrorVertical( const wxPoint& aCenter ) override;

eeschema/lib_circle.h

@@ -68,7 +68,7 @@ public:
 
     void MoveTo( const wxPoint& aPosition ) override;
 
-    const wxPoint GetPosition() const override { return m_Pos; }
+    wxPoint GetPosition() const override { return m_Pos; }
 
     void SetEnd( const wxPoint& aPosition ) { m_EndPos = aPosition; }
     wxPoint GetEnd() const { return m_EndPos; }

eeschema/lib_field.h

@@ -177,7 +177,7 @@ public:
 
     void MoveTo( const wxPoint& aPosition ) override;
 
-    const wxPoint GetPosition() const override { return EDA_TEXT::GetTextPos(); }
+    wxPoint GetPosition() const override { return EDA_TEXT::GetTextPos(); }
 
     void MirrorHorizontal( const wxPoint& aCenter ) override;
     void MirrorVertical( const wxPoint& aCenter ) override;

eeschema/lib_pin.h

@@ -427,7 +427,7 @@ public:
 
     void MoveTo( const wxPoint& aPosition ) override;
 
-    const wxPoint GetPosition() const override { return m_position; }
+    wxPoint GetPosition() const override { return m_position; }
 
     /**
      * move this and all linked pins to the new position

eeschema/lib_polyline.h

@@ -90,7 +90,7 @@ public:
 
     void MoveTo( const wxPoint& aPosition ) override;
 
-    const wxPoint GetPosition() const override { return m_PolyPoints[0]; }
+    wxPoint GetPosition() const override { return m_PolyPoints[0]; }
 
     void MirrorHorizontal( const wxPoint& aCenter ) override;
     void MirrorVertical( const wxPoint& aCenter ) override;

eeschema/lib_rectangle.h

@@ -71,7 +71,7 @@ public:
 
     void MoveTo( const wxPoint& aPosition ) override;
 
-    const wxPoint GetPosition() const override { return m_Pos; }
+    wxPoint GetPosition() const override { return m_Pos; }
 
     void MirrorHorizontal( const wxPoint& aCenter ) override;
     void MirrorVertical( const wxPoint& aCenter ) override;

eeschema/lib_text.h

@@ -81,7 +81,7 @@ public:
 
     void MoveTo( const wxPoint& aPosition ) override;
 
-    const wxPoint GetPosition() const override { return EDA_TEXT::GetTextPos(); }
+    wxPoint GetPosition() const override { return EDA_TEXT::GetTextPos(); }
 
     void MirrorHorizontal( const wxPoint& aCenter ) override;
     void MirrorVertical( const wxPoint& aCenter ) override;

eeschema/sch_bitmap.h

@@ -137,7 +137,7 @@ public:
 
     void GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, std::vector<MSG_PANEL_ITEM>& aList ) override;
 
-    const wxPoint GetPosition() const override { return m_pos; }
+    wxPoint GetPosition() const override { return m_pos; }
     void SetPosition( const wxPoint& aPosition ) override { m_pos = aPosition; }
 
     bool HitTest( const wxPoint& aPosition, int aAccuracy = 0 ) const override;

eeschema/sch_bus_entry.h

@@ -107,7 +107,7 @@ public:
 
     void GetConnectionPoints( std::vector< wxPoint >& aPoints ) const override;
 
-    const wxPoint GetPosition() const override { return m_pos; }
+    wxPoint GetPosition() const override { return m_pos; }
     void SetPosition( const wxPoint& aPosition ) override { m_pos = aPosition; }
 
     bool HitTest( const wxPoint& aPosition, int aAccuracy = 0 ) const override;

eeschema/sch_component.h

@@ -649,7 +649,7 @@ public:
 
     bool IsReplaceable() const override { return true; }
 
-    const wxPoint GetPosition() const override { return m_Pos; }
+    wxPoint GetPosition() const override { return m_Pos; }
     void SetPosition( const wxPoint& aPosition ) override { Move( aPosition - m_Pos ); }
 
     bool HitTest( const wxPoint& aPosition, int aAccuracy = 0 ) const override;

eeschema/sch_field.cpp

@@ -576,7 +576,7 @@ void SCH_FIELD::SetPosition( const wxPoint& aPosition )
 }
 
 
-const wxPoint SCH_FIELD::GetPosition() const
+wxPoint SCH_FIELD::GetPosition() const
 {
     if( m_Parent && m_Parent->Type() == SCH_COMPONENT_T )
     {

eeschema/sch_field.h

@@ -187,7 +187,7 @@ public:
 
     wxPoint GetLibPosition() const { return EDA_TEXT::GetTextPos(); }
 
-    const wxPoint GetPosition() const override;
+    wxPoint GetPosition() const override;
     void SetPosition( const wxPoint& aPosition ) override;
 
     wxPoint GetParentPosition() const;

eeschema/sch_item.h

@@ -136,7 +136,7 @@ public:
                 || ( m_pos == rhs.m_pos && m_item < rhs.m_item ) );
     }
 
-    const wxPoint GetPosition() const { return m_pos; }
+    wxPoint GetPosition() const { return m_pos; }
     EDA_ITEM* GetItem() const { return m_item; }
     const EDA_ITEM* GetParent() const { return m_parent; }
     DANGLING_END_T GetType() const { return m_type; }

eeschema/sch_junction.h

@@ -94,7 +94,7 @@ public:
 
     void GetNetListItem( NETLIST_OBJECT_LIST& aNetListItems, SCH_SHEET_PATH* aSheetPath ) override;
 
-    const wxPoint GetPosition() const override { return m_pos; }
+    wxPoint GetPosition() const override { return m_pos; }
     void SetPosition( const wxPoint& aPosition ) override { m_pos = aPosition; }
 
     int GetDiameter() const { return m_diameter; }

eeschema/sch_line.h

@@ -207,7 +207,7 @@ public:
 
     bool operator <( const SCH_ITEM& aItem ) const override;
 
-    const wxPoint GetPosition() const override { return m_start; }
+    wxPoint GetPosition() const override { return m_start; }
     void SetPosition( const wxPoint& aPosition ) override;
 
     bool HitTest( const wxPoint& aPosition, int aAccuracy = 0 ) const override;

eeschema/sch_marker.h

@@ -98,7 +98,7 @@ public:
 
     BITMAP_DEF GetMenuImage() const override;
 
-    const wxPoint GetPosition() const override { return m_Pos; }
+    wxPoint GetPosition() const override { return m_Pos; }
     void SetPosition( const wxPoint& aPosition ) override { m_Pos = aPosition; }
 
     bool HitTest( const wxPoint& aPosition, int aAccuracy = 0 ) const override;

eeschema/sch_no_connect.h

@@ -105,7 +105,7 @@ public:
 
     void GetNetListItem( NETLIST_OBJECT_LIST& aNetListItems, SCH_SHEET_PATH* aSheetPath ) override;
 
-    const wxPoint GetPosition() const override { return m_pos; }
+    wxPoint GetPosition() const override { return m_pos; }
     void SetPosition( const wxPoint& aPosition ) override { m_pos = aPosition; }
 
     bool HitTest( const wxPoint& aPosition, int aAccuracy = 0 ) const override;

eeschema/sch_pin.h

@@ -78,7 +78,7 @@ public:
 
     void Rotate( wxPoint aPosition ) override {}
 
-    const wxPoint GetPosition() const override { return GetTransformedPosition(); }
+    wxPoint GetPosition() const override { return GetTransformedPosition(); }
     const wxPoint GetLocalPosition() const { return m_position; }
     void SetPosition( const wxPoint& aPosition ) override { m_position = aPosition; }
 

eeschema/sch_sheet.h

@@ -567,7 +567,7 @@ public:
 
     void ViewGetLayers( int aLayers[], int& aCount ) const override;
 
-    const wxPoint GetPosition() const override { return m_pos; }
+    wxPoint GetPosition() const override { return m_pos; }
     void SetPosition( const wxPoint& aPosition ) override;
 
     bool HitTest( const wxPoint& aPosition, int aAccuracy ) const override;

eeschema/sch_text.h

@@ -310,7 +310,7 @@ public:
 
     void GetNetListItem( NETLIST_OBJECT_LIST& aNetListItems, SCH_SHEET_PATH* aSheetPath ) override;
 
-    const wxPoint GetPosition() const override { return EDA_TEXT::GetTextPos(); }
+    wxPoint GetPosition() const override { return EDA_TEXT::GetTextPos(); }
     void SetPosition( const wxPoint& aPosition ) override { EDA_TEXT::SetTextPos( aPosition ); }
 
     bool HitTest( const wxPoint& aPosition, int aAccuracy = 0 ) const override;

gerbview/gerber_draw_item.h

@@ -194,7 +194,7 @@ public:
      * @return const wxPoint& - The position of this object.
      * This function exists mainly to satisfy the virtual GetPosition() in parent class
      */
-    const wxPoint GetPosition() const override  { return m_Start; }
+    wxPoint GetPosition() const override  { return m_Start; }
     void SetPosition( const wxPoint& aPos )     {  m_Start = aPos; }
 
     /**

include/base_struct.h

@@ -334,7 +334,7 @@ public:
      */
     virtual const EDA_RECT GetBoundingBox() const;
 
-    virtual const wxPoint GetPosition() const { return wxPoint(); }
+    virtual wxPoint GetPosition() const { return wxPoint(); }
 
     /**
      * Function GetFocusPosition

include/class_board_item.h

@@ -97,9 +97,6 @@ public:
 
     // Do not create a copy constructor & operator=.
     // The ones generated by the compiler are adequate.
-
-    virtual wxPoint GetPosition() const = 0;
-
     int GetX() const
     {
         wxPoint p = GetPosition();

include/ws_draw_item.h

@@ -130,7 +130,7 @@ public:
     const wxPoint&  GetEnd() const { return m_end; }
     void SetEnd( wxPoint aPos ) override { m_end = aPos; }
 
-    const wxPoint GetPosition() const override { return GetStart(); }
+    wxPoint GetPosition() const override { return GetStart(); }
     void SetPosition( wxPoint aPos ) override { SetStart( aPos ); }
 
     const EDA_RECT GetBoundingBox() const override;
@@ -170,7 +170,7 @@ public:
 
     // Accessors:
     SHAPE_POLY_SET& GetPolygons() { return m_Polygons; }
-    const wxPoint GetPosition() const override { return m_pos; }
+    wxPoint GetPosition() const override { return m_pos; }
     void SetPosition( wxPoint aPos ) override;
 
     const EDA_RECT GetBoundingBox() const override;
@@ -210,7 +210,7 @@ public:
     const wxPoint&  GetEnd() const { return m_end; }
     void SetEnd( wxPoint aPos ) override { m_end = aPos; }
 
-    const wxPoint GetPosition() const override { return GetStart(); }
+    wxPoint GetPosition() const override { return GetStart(); }
     void SetPosition( wxPoint aPos ) override { SetStart( aPos ); }
 
     void PrintWsItem( RENDER_SETTINGS* aSettings, const wxPoint& aOffset ) override;
@@ -252,7 +252,7 @@ public:
     void SetMarkerPos( wxPoint aPos ) { m_markerPos = aPos; }
     double GetMarkerSize() const { return m_markerSize; }
 
-    const wxPoint GetPosition() const override { return wxPoint( 0, 0 ); }
+    wxPoint GetPosition() const override { return wxPoint( 0, 0 ); }
     void SetPosition( wxPoint aPos ) override { /* do nothing */ }
 
     void PrintWsItem( RENDER_SETTINGS* , const wxPoint&  ) override { /* do nothing */ }
@@ -295,7 +295,7 @@ public:
         EDA_TEXT::SetTextAngle( NormalizeAngle360Min( aAngle ) );
     }
 
-    const wxPoint GetPosition() const override { return GetTextPos(); }
+    wxPoint GetPosition() const override { return GetTextPos(); }
     void SetPosition( wxPoint aPos ) override { SetTextPos( aPos ); }
 
     const EDA_RECT GetBoundingBox() const override;
@@ -325,7 +325,7 @@ public:
 
     virtual wxString GetClass() const override { return wxT( "WS_DRAW_ITEM_BITMAP" ); }
 
-    const wxPoint GetPosition() const override { return m_pos; }
+    wxPoint GetPosition() const override { return m_pos; }
     void SetPosition( wxPoint aPos ) override { m_pos = aPos; }
 
     void PrintWsItem( RENDER_SETTINGS* aSettings, const wxPoint& aOffset ) override;

pcbnew/class_board.cpp

@@ -72,6 +72,11 @@ public:
     // pure virtuals:
     void SetPosition( const wxPoint& ) override {}
 
+    wxPoint GetPosition() const override {
+        return wxPoint(0, 0);
+    }
+
+
 #if defined(DEBUG)
     void Show( int , std::ostream&  ) const override {}
 #endif

pcbnew/class_track.cpp

@@ -896,7 +896,7 @@ void VIA::SwapData( BOARD_ITEM* aImage )
 }
 
 
-const wxPoint ARC::GetPosition() const
+wxPoint ARC::GetPosition() const
 {
     auto center = GetArcCenter( VECTOR2I( m_Start ), VECTOR2I( m_Mid ), VECTOR2I( m_End ) );
     return wxPoint( center.x, center.y );

pcbnew/class_track.h

@@ -298,7 +298,7 @@ public:
         m_Start = aPos;
     }
 
-    virtual const wxPoint GetPosition() const override;
+    virtual wxPoint GetPosition() const override;
 
     double GetRadius() const;
     double GetAngle() const;
@@ -408,7 +408,7 @@ public:
      */
     void SanitizeLayers();
 
-    const wxPoint GetPosition() const override {  return m_Start; }
+    wxPoint GetPosition() const override {  return m_Start; }
     void SetPosition( const wxPoint& aPoint ) override { m_Start = aPoint;  m_End = aPoint; }
 
     void GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, std::vector<MSG_PANEL_ITEM>& aList ) override;