haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add more consts all over the place

This commit is contained in:
Werni 2020-10-27 11:03:35 +00:00 committed by Ian McInerney
parent e739d5ba65
commit a7d5d1f091
53 changed files with 115 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/dialogs/dialog_text_entry.cpp
View File

@ -48,7 +48,7 @@ void WX_TEXT_ENTRY_DIALOG::SetTextValidator( const wxTextValidator& validator )
} }
wxString WX_TEXT_ENTRY_DIALOG::GetValue() wxString WX_TEXT_ENTRY_DIALOG::GetValue() const
{ {
return m_textCtrl->GetValue(); return m_textCtrl->GetValue();
} }

2
common/dialogs/dialog_text_entry.h
View File

@ -44,7 +44,7 @@ public:
void SetTextValidator( wxTextValidatorStyle style ); void SetTextValidator( wxTextValidatorStyle style );
void SetTextValidator( const wxTextValidator& validator ); void SetTextValidator( const wxTextValidator& validator );
wxString GetValue(); wxString GetValue() const;
}; };
#endif // _DIALOG_TEXT_ENTRY_H_ #endif // _DIALOG_TEXT_ENTRY_H_

4
common/eda_size_ctrl.cpp
View File

@ -62,7 +62,7 @@ EDA_POSITION_CTRL::~EDA_POSITION_CTRL()
/* Returns (in internal units) to coordinate between (in user units) /* Returns (in internal units) to coordinate between (in user units)
*/ */
wxPoint EDA_POSITION_CTRL::GetValue() wxPoint EDA_POSITION_CTRL::GetValue() const
{ {
return wxPoint( ValueFromString( m_UserUnit, m_FramePosX->GetValue() ), return wxPoint( ValueFromString( m_UserUnit, m_FramePosX->GetValue() ),
ValueFromString( m_UserUnit, m_FramePosY->GetValue() ) ); ValueFromString( m_UserUnit, m_FramePosY->GetValue() ) );
@ -93,7 +93,7 @@ EDA_SIZE_CTRL::EDA_SIZE_CTRL( wxWindow* parent, const wxString& title, const wxS
} }
wxSize EDA_SIZE_CTRL::GetValue() wxSize EDA_SIZE_CTRL::GetValue() const
{ {
wxPoint pos = EDA_POSITION_CTRL::GetValue(); wxPoint pos = EDA_POSITION_CTRL::GetValue();

2
common/eda_text.cpp
View File

@ -481,7 +481,7 @@ void EDA_TEXT::printOneLineOfText( RENDER_SETTINGS* aSettings, const wxPoint& aO
} }
wxString EDA_TEXT::GetTextStyleName() wxString EDA_TEXT::GetTextStyleName() const
{ {
int style = 0; int style = 0;

12
common/origin_transforms.cpp
View File

@ -33,37 +33,37 @@ ORIGIN_TRANSFORMS::~ORIGIN_TRANSFORMS()
int ORIGIN_TRANSFORMS::ToDisplay( int aValue, int ORIGIN_TRANSFORMS::ToDisplay( int aValue,
COORD_TYPES_T aCoordType ) COORD_TYPES_T aCoordType ) const
{ {
return static_cast<int>( ToDisplay( static_cast<long long int>( aValue ), aCoordType ) ); return static_cast<int>( ToDisplay( static_cast<long long int>( aValue ), aCoordType ) );
} }
long long int ORIGIN_TRANSFORMS::ToDisplay( long long int aValue, long long int ORIGIN_TRANSFORMS::ToDisplay( long long int aValue,
COORD_TYPES_T aCoordType ) COORD_TYPES_T aCoordType ) const
{ {
return aValue; return aValue;
} }
double ORIGIN_TRANSFORMS::ToDisplay( double aValue, double ORIGIN_TRANSFORMS::ToDisplay( double aValue,
COORD_TYPES_T aCoordType ) COORD_TYPES_T aCoordType ) const
{ {
return aValue; return aValue;
} }
int ORIGIN_TRANSFORMS::FromDisplay( int aValue, int ORIGIN_TRANSFORMS::FromDisplay( int aValue,
COORD_TYPES_T aCoordType ) COORD_TYPES_T aCoordType ) const
{ {
return static_cast<int>( FromDisplay( static_cast<long long int>( aValue ), aCoordType ) ); return static_cast<int>( FromDisplay( static_cast<long long int>( aValue ), aCoordType ) );
} }
long long int ORIGIN_TRANSFORMS::FromDisplay( long long int aValue, long long int ORIGIN_TRANSFORMS::FromDisplay( long long int aValue,
COORD_TYPES_T aCoordType ) COORD_TYPES_T aCoordType ) const
{ {
return aValue; return aValue;
} }
double ORIGIN_TRANSFORMS::FromDisplay( double aValue, double ORIGIN_TRANSFORMS::FromDisplay( double aValue,
COORD_TYPES_T aCoordType ) COORD_TYPES_T aCoordType ) const
{ {
return aValue; return aValue;
} }

2
common/tool/action_manager.cpp
View File

@ -225,7 +225,7 @@ bool ACTION_MANAGER::RunHotKey( int aHotKey ) const
} }
const std::map<std::string, TOOL_ACTION*>& ACTION_MANAGER::GetActions() const std::map<std::string, TOOL_ACTION*>& ACTION_MANAGER::GetActions() const
{ {
return m_actionNameIndex; return m_actionNameIndex;
} }

4
common/view/view.cpp
View File

@ -1504,13 +1504,13 @@ bool VIEW::IsVisible( const VIEW_ITEM* aItem ) const
} }
void VIEW::Update( VIEW_ITEM* aItem ) void VIEW::Update( const VIEW_ITEM* aItem ) const
{ {
Update( aItem, ALL ); Update( aItem, ALL );
} }
void VIEW::Update( VIEW_ITEM* aItem, int aUpdateFlags ) void VIEW::Update( const VIEW_ITEM* aItem, int aUpdateFlags ) const
{ {
VIEW_ITEM_DATA* viewData = aItem->viewPrivData(); VIEW_ITEM_DATA* viewData = aItem->viewPrivData();

4
eeschema/dialogs/dialog_fields_editor_global.cpp
View File

@ -263,13 +263,13 @@ public:
return GetValue( m_rows[ aRow ], aCol ); return GetValue( m_rows[ aRow ], aCol );
} }
std::vector<SCH_REFERENCE> GetRowReferences( int aRow ) std::vector<SCH_REFERENCE> GetRowReferences( int aRow ) const
{ {
wxCHECK( aRow < (int)m_rows.size(), std::vector<SCH_REFERENCE>() ); wxCHECK( aRow < (int)m_rows.size(), std::vector<SCH_REFERENCE>() );
return m_rows[ aRow ].m_Refs; return m_rows[ aRow ].m_Refs;
} }
wxString GetValue( DATA_MODEL_ROW& group, int aCol ) wxString GetValue( const DATA_MODEL_ROW& group, int aCol )
{ {
std::vector<SCH_REFERENCE> references; std::vector<SCH_REFERENCE> references;
wxString fieldValue; wxString fieldValue;

4
eeschema/fields_grid_table.cpp
View File

@ -613,7 +613,7 @@ void FIELDS_GRID_TRICKS::doPopupSelection( wxCommandEvent& event )
template <class T> template <class T>
wxString FIELDS_GRID_TABLE<T>::StringFromBool( bool aValue ) wxString FIELDS_GRID_TABLE<T>::StringFromBool( bool aValue ) const
{ {
if( aValue ) if( aValue )
return wxT( "1" ); return wxT( "1" );
@ -623,7 +623,7 @@ wxString FIELDS_GRID_TABLE<T>::StringFromBool( bool aValue )
template <class T> template <class T>
bool FIELDS_GRID_TABLE<T>::BoolFromString( wxString aValue ) bool FIELDS_GRID_TABLE<T>::BoolFromString( wxString aValue ) const
{ {
if( aValue == "1" ) if( aValue == "1" )
{ {

4
eeschema/fields_grid_table.h
View File

@ -96,8 +96,8 @@ public:
void SetValue( int aRow, int aCol, const wxString &aValue ) override; void SetValue( int aRow, int aCol, const wxString &aValue ) override;
void SetValueAsBool( int aRow, int aCol, bool aValue ) override; void SetValueAsBool( int aRow, int aCol, bool aValue ) override;
wxString StringFromBool( bool aValue ); wxString StringFromBool( bool aValue ) const;
bool BoolFromString( wxString aValue ); bool BoolFromString( wxString aValue ) const;
protected: protected:
void initGrid( DIALOG_SHIM* aDialog ); void initGrid( DIALOG_SHIM* aDialog );

2
eeschema/lib_arc.h
View File

@ -65,7 +65,7 @@ public:
return wxT( "LIB_ARC" ); return wxT( "LIB_ARC" );
} }
wxString GetTypeName() override wxString GetTypeName() const override
{ {
return _( "Arc" ); return _( "Arc" );
} }

2
eeschema/lib_bezier.h
View File

@ -49,7 +49,7 @@ public:
return wxT( "LIB_BEZIER" ); return wxT( "LIB_BEZIER" );
} }
wxString GetTypeName() override wxString GetTypeName() const override
{ {
return _( "Bezier" ); return _( "Bezier" );
} }

2
eeschema/lib_circle.h
View File

@ -48,7 +48,7 @@ public:
return wxT( "LIB_CIRCLE" ); return wxT( "LIB_CIRCLE" );
} }
wxString GetTypeName() override wxString GetTypeName() const override
{ {
return _( "Circle" ); return _( "Circle" );
} }

2
eeschema/lib_field.h
View File

@ -97,7 +97,7 @@ public:
return wxT( "LIB_FIELD" ); return wxT( "LIB_FIELD" );
} }
wxString GetTypeName() override wxString GetTypeName() const override
{ {
return _( "Field" ); return _( "Field" );
} }

2
eeschema/lib_item.h
View File

@ -120,7 +120,7 @@ public:
* Provide a user-consumable name of the object type. Perform localization when * Provide a user-consumable name of the object type. Perform localization when
* called so that run-time language selection works. * called so that run-time language selection works.
*/ */
virtual wxString GetTypeName() = 0; virtual wxString GetTypeName() const = 0;
/** /**
* Begin drawing a component library draw item at \a aPosition. * Begin drawing a component library draw item at \a aPosition.

2
eeschema/lib_pin.h
View File

@ -117,7 +117,7 @@ public:
return wxT( "LIB_PIN" ); return wxT( "LIB_PIN" );
} }
wxString GetTypeName() override wxString GetTypeName() const override
{ {
return _( "Pin" ); return _( "Pin" );
} }

2
eeschema/lib_polyline.h
View File

@ -48,7 +48,7 @@ public:
return wxT( "LIB_POLYLINE" ); return wxT( "LIB_POLYLINE" );
} }
wxString GetTypeName() override wxString GetTypeName() const override
{ {
return _( "PolyLine" ); return _( "PolyLine" );
} }

2
eeschema/lib_rectangle.h
View File

@ -49,7 +49,7 @@ public:
return wxT( "LIB_RECTANGLE" ); return wxT( "LIB_RECTANGLE" );
} }
wxString GetTypeName() override wxString GetTypeName() const override
{ {
return _( "Rectangle" ); return _( "Rectangle" );
} }

2
eeschema/lib_text.h
View File

@ -54,7 +54,7 @@ public:
return wxT( "LIB_TEXT" ); return wxT( "LIB_TEXT" );
} }
wxString GetTypeName() override wxString GetTypeName() const override
{ {
return _( "Text" ); return _( "Text" );
} }

6
eeschema/sch_rtree.h
View File

@ -119,7 +119,7 @@ public:
* @param aRobust If true, search the whole tree, not just the bounding box * @param aRobust If true, search the whole tree, not just the bounding box
* @return true if the item definitely exists, false if it does not exist within bbox * @return true if the item definitely exists, false if it does not exist within bbox
*/ */
bool contains( SCH_ITEM* aItem, bool aRobust = false ) bool contains( const SCH_ITEM* aItem, bool aRobust = false ) const
{ {
const EDA_RECT& bbox = aItem->GetBoundingBox(); const EDA_RECT& bbox = aItem->GetBoundingBox();
const int type = int( aItem->Type() ); const int type = int( aItem->Type() );
@ -158,12 +158,12 @@ public:
* Returns the number of items in the tree * Returns the number of items in the tree
* @return number of elements in the tree; * @return number of elements in the tree;
*/ */
size_t size() size_t size() const
{ {
return m_count; return m_count;
} }
bool empty() bool empty() const
{ {
return m_count == 0; return m_count == 0;
} }

6
include/class_pcb_group.h
View File

@ -178,7 +178,7 @@ public:
* *
* @param aCommit is the commit to add the children to. * @param aCommit is the commit to add the children to.
*/ */
void AddChildrenToCommit( BOARD_COMMIT& aCommit ) void AddChildrenToCommit( BOARD_COMMIT& aCommit ) const
{ {
RunOnChildren( [&]( BOARD_ITEM* bItem ) RunOnChildren( [&]( BOARD_ITEM* bItem )
{ {
@ -191,7 +191,7 @@ public:
* Note that this function should not add or remove items to the group * Note that this function should not add or remove items to the group
* @param aFunction is the function to be invoked. * @param aFunction is the function to be invoked.
*/ */
void RunOnChildren( const std::function<void ( BOARD_ITEM* )>& aFunction ); void RunOnChildren( const std::function<void ( BOARD_ITEM* )>& aFunction ) const;
/** /**
* Invokes a function on all descendents of the group. * Invokes a function on all descendents of the group.
@ -199,7 +199,7 @@ public:
* groups. * groups.
* @param aFunction is the function to be invoked. * @param aFunction is the function to be invoked.
*/ */
void RunOnDescendants( const std::function<void( BOARD_ITEM* )>& aFunction ); void RunOnDescendants( const std::function<void( BOARD_ITEM* )>& aFunction ) const;
private: private:
std::unordered_set<BOARD_ITEM*> m_items; // Members of the group std::unordered_set<BOARD_ITEM*> m_items; // Members of the group

4
include/dialog_helpers.h
View File

@ -117,7 +117,7 @@ public:
void Enable( bool x_win_on, bool y_win_on ); void Enable( bool x_win_on, bool y_win_on );
void SetValue( int x_value, int y_value ); void SetValue( int x_value, int y_value );
wxPoint GetValue(); wxPoint GetValue() const;
}; };
@ -132,7 +132,7 @@ public:
EDA_UNITS user_unit, wxBoxSizer* BoxSizer ); EDA_UNITS user_unit, wxBoxSizer* BoxSizer );
~EDA_SIZE_CTRL() { } ~EDA_SIZE_CTRL() { }
wxSize GetValue(); wxSize GetValue() const;
}; };

2
include/eda_rect.h
View File

@ -106,7 +106,7 @@ public:
* @brief GetSizeMax * @brief GetSizeMax
* @return the max size dimension * @return the max size dimension
*/ */
int GetSizeMax() const { return ( m_Size.x > m_Size.y )?m_Size.x:m_Size.y; } int GetSizeMax() const { return ( m_Size.x > m_Size.y ) ? m_Size.x : m_Size.y; }
int GetX() const { return m_Pos.x; } int GetX() const { return m_Pos.x; }
int GetY() const { return m_Pos.y; } int GetY() const { return m_Pos.y; }

2
include/eda_text.h
View File

@ -351,7 +351,7 @@ public:
/** /**
* @return a wxString with the style name( Normal, Italic, Bold, Bold+Italic) * @return a wxString with the style name( Normal, Italic, Bold, Bold+Italic)
*/ */
wxString GetTextStyleName(); wxString GetTextStyleName() const;
/** /**
* Populate \a aPositions with the position of each line of * Populate \a aPositions with the position of each line of

4
include/gbr_netlist_metadata.h
View File

@ -107,7 +107,7 @@ public:
void Clear() { clear(); } void Clear() { clear(); }
const wxString& GetValue() { return m_field; } const wxString& GetValue() const { return m_field; }
void SetField( const wxString& aField, bool aUseUTF8, bool aEscapeString ) void SetField( const wxString& aField, bool aUseUTF8, bool aEscapeString )
{ {
@ -116,7 +116,7 @@ public:
m_escapeString = aEscapeString; m_escapeString = aEscapeString;
} }
bool IsEmpty() { return m_field.IsEmpty(); } bool IsEmpty() const { return m_field.IsEmpty(); }
std::string GetGerberString(); std::string GetGerberString();

2
include/libeval_compiler/libeval_compiler.h
View File

@ -254,7 +254,7 @@ public:
VAR_REF() {}; VAR_REF() {};
virtual ~VAR_REF() {}; virtual ~VAR_REF() {};
virtual VAR_TYPE_T GetType() = 0; virtual VAR_TYPE_T GetType() const = 0;
virtual VALUE GetValue( CONTEXT* aCtx ) = 0; virtual VALUE GetValue( CONTEXT* aCtx ) = 0;
}; };

22
include/origin_transforms.h
View File

@ -23,7 +23,7 @@
*/ */
#ifndef ORIGIN_TRANSFORMS_H_ #ifndef ORIGIN_TRANSFORMS_H_
#define ORIGIN_TRANSFORMS_H_ 1 #define ORIGIN_TRANSFORMS_H_
/** /**
* A class to perform either relative or absolute display origin * A class to perform either relative or absolute display origin
@ -61,28 +61,28 @@ public:
// =============== Single-axis Transforms =============== // =============== Single-axis Transforms ===============
virtual int ToDisplay( int aValue, virtual int ToDisplay( int aValue,
COORD_TYPES_T aCoordType ); COORD_TYPES_T aCoordType ) const;
virtual long long int ToDisplay( long long int aValue, virtual long long int ToDisplay( long long int aValue,
COORD_TYPES_T aCoordType ); COORD_TYPES_T aCoordType ) const;
virtual double ToDisplay( double aValue, virtual double ToDisplay( double aValue,
COORD_TYPES_T aCoordType ); COORD_TYPES_T aCoordType ) const;
virtual int FromDisplay( int aValue, virtual int FromDisplay( int aValue,
COORD_TYPES_T aCoordType ); COORD_TYPES_T aCoordType ) const;
virtual long long int FromDisplay( long long int aValue, virtual long long int FromDisplay( long long int aValue,
COORD_TYPES_T aCoordType ); COORD_TYPES_T aCoordType ) const;
virtual double FromDisplay( double aValue, virtual double FromDisplay( double aValue,
COORD_TYPES_T aCoordType ); COORD_TYPES_T aCoordType ) const;
// =============== Two-axis Transforms =============== // =============== Two-axis Transforms ===============
template<class T> template<class T>
T ToDisplayAbs( const T& aValue ) T ToDisplayAbs( const T& aValue ) const
{ {
T displayValue; T displayValue;
@ -92,7 +92,7 @@ public:
} }
template<class T> template<class T>
T ToDisplayRel( const T& aValue ) T ToDisplayRel( const T& aValue ) const
{ {
T displayValue; T displayValue;
@ -103,7 +103,7 @@ public:
template<class T> template<class T>
T FromDisplayAbs( const T& aValue ) T FromDisplayAbs( const T& aValue ) const
{ {
T displayValue; T displayValue;
@ -113,7 +113,7 @@ public:
} }
template<class T> template<class T>
T FromDisplayRel( const T& aValue ) T FromDisplayRel( const T& aValue ) const
{ {
T displayValue; T displayValue;

2
include/tool/action_manager.h
View File

@ -110,7 +110,7 @@ public:
/** /**
* Get a list of currently-registered actions mapped by their name. * Get a list of currently-registered actions mapped by their name.
*/ */
const std::map<std::string, TOOL_ACTION*>& GetActions(); const std::map<std::string, TOOL_ACTION*>& GetActions() const;
/** /**
* Finds an action with a given name (if there is one available). * Finds an action with a given name (if there is one available).

4
include/view/view.h
View File

@ -141,8 +141,8 @@ public:
* @param aItem: the item to update. * @param aItem: the item to update.
* @param aUpdateFlags: how much the object has changed. * @param aUpdateFlags: how much the object has changed.
*/ */
virtual void Update( VIEW_ITEM* aItem, int aUpdateFlags ); virtual void Update( const VIEW_ITEM* aItem, int aUpdateFlags ) const;
virtual void Update( VIEW_ITEM* aItem ); virtual void Update( const VIEW_ITEM* aItem ) const;
/** /**
* Function SetRequired() * Function SetRequired()

2
include/view/view_rtree.h
View File

@ -77,7 +77,7 @@ public:
* with aBounds. * with aBounds.
*/ */
template <class Visitor> template <class Visitor>
void Query( const BOX2I& aBounds, Visitor& aVisitor ) // const void Query( const BOX2I& aBounds, Visitor& aVisitor ) const
{ {
int mmin[2] = { aBounds.GetX(), aBounds.GetY() }; int mmin[2] = { aBounds.GetX(), aBounds.GetY() };
int mmax[2] = { aBounds.GetRight(), aBounds.GetBottom() }; int mmax[2] = { aBounds.GetRight(), aBounds.GetBottom() };

2
include/widgets/bitmap_toggle.h
View File

@ -50,7 +50,7 @@ public:
void SetValue( bool aValue ); void SetValue( bool aValue );
///> Read the checkbox state ///> Read the checkbox state
bool GetValue() { return m_checked; } bool GetValue() const { return m_checked; }
private: private:
bool m_checked; bool m_checked;

8
libs/kimath/include/geometry/shape_index.h
View File

@ -173,7 +173,7 @@ class SHAPE_INDEX
* Checks if the iterator has reached the end. * Checks if the iterator has reached the end.
* @return true if it is in an invalid position (data finished) * @return true if it is in an invalid position (data finished)
*/ */
bool IsNull() bool IsNull() const
{ {
return iterator.IsNull(); return iterator.IsNull();
} }
@ -184,7 +184,7 @@ class SHAPE_INDEX
* Checks if the iterator has not reached the end. * Checks if the iterator has not reached the end.
* @return true if it is in an valid position (data not finished) * @return true if it is in an valid position (data not finished)
*/ */
bool IsNotNull() bool IsNotNull() const
{ {
return iterator.IsNotNull(); return iterator.IsNotNull();
} }
@ -275,7 +275,7 @@ class SHAPE_INDEX
* @param aVisitor object to be invoked on every object contained in the search area. * @param aVisitor object to be invoked on every object contained in the search area.
*/ */
template <class V> template <class V>
int Query( const SHAPE *aShape, int aMinDistance, V& aVisitor, bool aExact ) int Query( const SHAPE *aShape, int aMinDistance, V& aVisitor) const
{ {
BOX2I box = aShape->BBox(); BOX2I box = aShape->BBox();
box.Inflate( aMinDistance ); box.Inflate( aMinDistance );
@ -377,4 +377,4 @@ typename SHAPE_INDEX<T>::Iterator SHAPE_INDEX<T>::Begin()
return Iterator( this ); return Iterator( this );
} }
#endif #endif /* __SHAPE_INDEX_H */

6
pcbnew/class_board.cpp
View File

@ -969,7 +969,7 @@ wxString BOARD::ConvertKIIDsToCrossReferences( const wxString& aSource )
} }
unsigned BOARD::GetNodesCount( int aNet ) unsigned BOARD::GetNodesCount( int aNet ) const
{ {
unsigned retval = 0; unsigned retval = 0;
@ -1854,7 +1854,7 @@ bool BOARD::GetBoardPolygonOutlines( SHAPE_POLY_SET& aOutlines, wxString* aError
} }
const std::vector<D_PAD*> BOARD::GetPads() const std::vector<D_PAD*> BOARD::GetPads() const
{ {
std::vector<D_PAD*> allPads; std::vector<D_PAD*> allPads;
@ -1868,7 +1868,7 @@ const std::vector<D_PAD*> BOARD::GetPads()
} }
unsigned BOARD::GetPadCount() unsigned BOARD::GetPadCount() const
{ {
unsigned retval = 0; unsigned retval = 0;

6
pcbnew/class_board.h
View File

@ -680,7 +680,7 @@ public:
* @param aNet Only count nodes belonging to this net * @param aNet Only count nodes belonging to this net
* @return the number of pads members of nets (i.e. with netcode > 0) * @return the number of pads members of nets (i.e. with netcode > 0)
*/ */
unsigned GetNodesCount( int aNet = -1 ); unsigned GetNodesCount( int aNet = -1 ) const;
/** /**
* @return the number of unconnected nets in the current ratsnest. * @return the number of unconnected nets in the current ratsnest.
@ -690,7 +690,7 @@ public:
/** /**
* @return the number of pads in board * @return the number of pads in board
*/ */
unsigned GetPadCount(); unsigned GetPadCount() const;
/** /**
* Return a reference to a list of all the pads. * Return a reference to a list of all the pads.
@ -700,7 +700,7 @@ public:
* *
* @return D_PADS - a full list of pads * @return D_PADS - a full list of pads
*/ */
const std::vector<D_PAD*> GetPads(); const std::vector<D_PAD*> GetPads() const;
void BuildListOfNets() void BuildListOfNets()
{ {

2
pcbnew/class_module.cpp
View File

@ -1063,7 +1063,7 @@ EDA_ITEM* MODULE::Clone() const
} }
void MODULE::RunOnChildren( const std::function<void (BOARD_ITEM*)>& aFunction ) void MODULE::RunOnChildren( const std::function<void (BOARD_ITEM*)>& aFunction ) const
{ {
try try
{ {

2
pcbnew/class_module.h
View File

@ -594,7 +594,7 @@ public:
* Note that this function should not add or remove items to the module * Note that this function should not add or remove items to the module
* @param aFunction is the function to be invoked. * @param aFunction is the function to be invoked.
*/ */
void RunOnChildren( const std::function<void (BOARD_ITEM*)>& aFunction ); void RunOnChildren( const std::function<void (BOARD_ITEM*)>& aFunction ) const;
/** /**
* Returns a set of all layers that this module has drawings on similar to ViewGetLayers() * Returns a set of all layers that this module has drawings on similar to ViewGetLayers()

4
pcbnew/class_pcb_group.cpp
View File

@ -310,7 +310,7 @@ void PCB_GROUP::GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, std::vector<MSG_PANEL_I
} }
void PCB_GROUP::RunOnChildren( const std::function<void( BOARD_ITEM* )>& aFunction ) void PCB_GROUP::RunOnChildren( const std::function<void( BOARD_ITEM* )>& aFunction ) const
{ {
try try
{ {
@ -324,7 +324,7 @@ void PCB_GROUP::RunOnChildren( const std::function<void( BOARD_ITEM* )>& aFuncti
} }
void PCB_GROUP::RunOnDescendants( const std::function<void( BOARD_ITEM* )>& aFunction ) void PCB_GROUP::RunOnDescendants( const std::function<void( BOARD_ITEM* )>& aFunction ) const
{ {
try try
{ {

2
pcbnew/class_track.cpp
View File

@ -713,7 +713,7 @@ void VIA::GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, std::vector<MSG_PANEL_ITEM>&
} }
void TRACK::GetMsgPanelInfoBase_Common( EDA_DRAW_FRAME* aFrame, std::vector<MSG_PANEL_ITEM>& aList ) void TRACK::GetMsgPanelInfoBase_Common( EDA_DRAW_FRAME* aFrame, std::vector<MSG_PANEL_ITEM>& aList ) const
{ {
wxString msg; wxString msg;

2
pcbnew/class_track.h
View File

@ -259,7 +259,7 @@ public:
#endif #endif
protected: protected:
void GetMsgPanelInfoBase_Common( EDA_DRAW_FRAME* aFrame, std::vector<MSG_PANEL_ITEM>& aList ); void GetMsgPanelInfoBase_Common( EDA_DRAW_FRAME* aFrame, std::vector<MSG_PANEL_ITEM>& aList ) const;
int m_Width; ///< Thickness of track, or via diameter int m_Width; ///< Thickness of track, or via diameter

2
pcbnew/connectivity/connectivity_rtree.h
View File

@ -107,7 +107,7 @@ public:
* with aBounds. * with aBounds.
*/ */
template <class Visitor> template <class Visitor>
void Query( const BOX2I& aBounds, const LAYER_RANGE& aRange, Visitor& aVisitor ) void Query( const BOX2I& aBounds, const LAYER_RANGE& aRange, Visitor& aVisitor ) const
{ {
const int mmin[3] = { aRange.Start(), aBounds.GetX(), aBounds.GetY() }; const int mmin[3] = { aRange.Start(), aBounds.GetX(), aBounds.GetY() };
const int mmax[3] = { aRange.End(), aBounds.GetRight(), aBounds.GetBottom() }; const int mmax[3] = { aRange.End(), aBounds.GetRight(), aBounds.GetBottom() };

2
pcbnew/dialogs/dialog_get_footprint_by_name.h
View File

@ -55,7 +55,7 @@ public:
} }
// returns the selected text (fp reference) // returns the selected text (fp reference)
const wxString GetValue() const wxString GetValue() const
{ {
return m_SearchTextCtrl->GetValue(); return m_SearchTextCtrl->GetValue();
} }

2
pcbnew/dialogs/wizard_3DShape_Libs_downloader.h
View File

@ -95,7 +95,7 @@ protected:
} }
///> Gets the current target for downloaded libraries ///> Gets the current target for downloaded libraries
inline wxString getDownloadDir() inline wxString getDownloadDir() const
{ {
return m_downloadDir->GetValue(); return m_downloadDir->GetValue();
} }

10
pcbnew/drc/drc_rtree.h
View File

@ -240,7 +240,7 @@ public:
bool CheckColliding( SHAPE* aRefShape, bool CheckColliding( SHAPE* aRefShape,
PCB_LAYER_ID aTargetLayer, PCB_LAYER_ID aTargetLayer,
int aClearance = 0, int aClearance = 0,
std::function<bool( BOARD_ITEM*)> aFilter = nullptr ) std::function<bool( BOARD_ITEM*)> aFilter = nullptr ) const
{ {
BOX2I box = aRefShape->BBox(); BOX2I box = aRefShape->BBox();
box.Inflate( aClearance ); box.Inflate( aClearance );
@ -276,7 +276,7 @@ public:
PCB_LAYER_ID aTargetLayer, PCB_LAYER_ID aTargetLayer,
std::function<bool( BOARD_ITEM*)> aFilter = nullptr, std::function<bool( BOARD_ITEM*)> aFilter = nullptr,
std::function<bool( BOARD_ITEM*, int)> aVisitor = nullptr, std::function<bool( BOARD_ITEM*, int)> aVisitor = nullptr,
int aClearance = 0 ) int aClearance = 0 ) const
{ {
// keep track of BOARD_ITEMs that have been already found to collide (some items // keep track of BOARD_ITEMs that have been already found to collide (some items
// might be build of COMPOUND/triangulated shapes and a single subshape collision // might be build of COMPOUND/triangulated shapes and a single subshape collision
@ -344,7 +344,7 @@ public:
ITEM_WITH_SHAPE*, ITEM_WITH_SHAPE*, ITEM_WITH_SHAPE*, ITEM_WITH_SHAPE*,
bool* aCollision )> aVisitor, bool* aCollision )> aVisitor,
int aMaxClearance, int aMaxClearance,
std::function<bool(int, int )> aProgressReporter ) std::function<bool(int, int )> aProgressReporter ) const
{ {
std::vector< PAIR_INFO > pairsToVisit; std::vector< PAIR_INFO > pairsToVisit;
@ -463,12 +463,12 @@ public:
* Returns the number of items in the tree * Returns the number of items in the tree
* @return number of elements in the tree; * @return number of elements in the tree;
*/ */
size_t size() size_t size() const
{ {
return m_count; return m_count;
} }
bool empty() bool empty() const
{ {
return m_count == 0; return m_count == 0;
} }

4
pcbnew/pcb_expr_evaluator.cpp
View File

@ -488,9 +488,9 @@ void PCB_EXPR_BUILTIN_FUNCTIONS::RegisterAllFunctions()
} }
BOARD_ITEM* PCB_EXPR_VAR_REF::GetObject( LIBEVAL::CONTEXT* aCtx ) const BOARD_ITEM* PCB_EXPR_VAR_REF::GetObject( const LIBEVAL::CONTEXT* aCtx ) const
{ {
wxASSERT( dynamic_cast<PCB_EXPR_CONTEXT*>( aCtx ) ); wxASSERT( dynamic_cast<const PCB_EXPR_CONTEXT*>( aCtx ) );
const PCB_EXPR_CONTEXT* ctx = static_cast<const PCB_EXPR_CONTEXT*>( aCtx ); const PCB_EXPR_CONTEXT* ctx = static_cast<const PCB_EXPR_CONTEXT*>( aCtx );
BOARD_ITEM* item = ctx->GetItem( m_itemIndex ); BOARD_ITEM* item = ctx->GetItem( m_itemIndex );

4
pcbnew/pcb_expr_evaluator.h
View File

@ -97,7 +97,7 @@ public:
bool IsEnum() const { return m_isEnum; } bool IsEnum() const { return m_isEnum; }
void SetType( LIBEVAL::VAR_TYPE_T type ) { m_type = type; } void SetType( LIBEVAL::VAR_TYPE_T type ) { m_type = type; }
LIBEVAL::VAR_TYPE_T GetType() override { return m_type; } LIBEVAL::VAR_TYPE_T GetType() const override { return m_type; }
void AddAllowedClass( TYPE_ID type_hash, PROPERTY_BASE* prop ) void AddAllowedClass( TYPE_ID type_hash, PROPERTY_BASE* prop )
{ {
@ -106,7 +106,7 @@ public:
virtual LIBEVAL::VALUE GetValue( LIBEVAL::CONTEXT* aCtx ) override; virtual LIBEVAL::VALUE GetValue( LIBEVAL::CONTEXT* aCtx ) override;
BOARD_ITEM* GetObject( LIBEVAL::CONTEXT* aCtx ) const; BOARD_ITEM* GetObject( const LIBEVAL::CONTEXT* aCtx ) const;
private: private:
std::unordered_map<TYPE_ID, PROPERTY_BASE*> m_matchingTypes; std::unordered_map<TYPE_ID, PROPERTY_BASE*> m_matchingTypes;

8
pcbnew/pcb_origin_transforms.cpp
View File

@ -39,7 +39,7 @@ PCB_ORIGIN_TRANSFORMS::~PCB_ORIGIN_TRANSFORMS()
{} {}
long long int PCB_ORIGIN_TRANSFORMS::ToDisplay( long long int aValue, long long int PCB_ORIGIN_TRANSFORMS::ToDisplay( long long int aValue,
COORD_TYPES_T aCoordType ) COORD_TYPES_T aCoordType ) const
{ {
long long int value = aValue; long long int value = aValue;
@ -57,7 +57,7 @@ long long int PCB_ORIGIN_TRANSFORMS::ToDisplay( long long int aValue,
} }
double PCB_ORIGIN_TRANSFORMS::ToDisplay( double aValue, double PCB_ORIGIN_TRANSFORMS::ToDisplay( double aValue,
COORD_TYPES_T aCoordType ) COORD_TYPES_T aCoordType ) const
{ {
double value = aValue; double value = aValue;
@ -75,7 +75,7 @@ double PCB_ORIGIN_TRANSFORMS::ToDisplay( double aValue,
} }
long long int PCB_ORIGIN_TRANSFORMS::FromDisplay( long long int aValue, long long int PCB_ORIGIN_TRANSFORMS::FromDisplay( long long int aValue,
COORD_TYPES_T aCoordType ) COORD_TYPES_T aCoordType ) const
{ {
long long value = aValue; long long value = aValue;
@ -93,7 +93,7 @@ long long int PCB_ORIGIN_TRANSFORMS::FromDisplay( long long int aValue,
} }
double PCB_ORIGIN_TRANSFORMS::FromDisplay( double aValue, double PCB_ORIGIN_TRANSFORMS::FromDisplay( double aValue,
COORD_TYPES_T aCoordType ) COORD_TYPES_T aCoordType ) const
{ {
double value = aValue; double value = aValue;

10
pcbnew/pcb_origin_transforms.h
View File

@ -23,7 +23,7 @@
*/ */
#ifndef PCB_ORIGIN_TRANSFORM_H_ #ifndef PCB_ORIGIN_TRANSFORM_H_
#define PCB_ORIGIN_TRANSFORM_H_ 1 #define PCB_ORIGIN_TRANSFORM_H_
#include <origin_transforms.h> #include <origin_transforms.h>
@ -38,16 +38,16 @@ public:
using ORIGIN_TRANSFORMS::ToDisplay; using ORIGIN_TRANSFORMS::ToDisplay;
virtual long long int ToDisplay( long long int aValue, COORD_TYPES_T aCoordType ) override; virtual long long int ToDisplay( long long int aValue, COORD_TYPES_T aCoordType ) const override;
virtual double ToDisplay( double aValue, COORD_TYPES_T aCoordType ) override; virtual double ToDisplay( double aValue, COORD_TYPES_T aCoordType ) const override;
using ORIGIN_TRANSFORMS::FromDisplay; using ORIGIN_TRANSFORMS::FromDisplay;
virtual long long int FromDisplay( long long int aValue, COORD_TYPES_T aCoordType ) override; virtual long long int FromDisplay( long long int aValue, COORD_TYPES_T aCoordType ) const override;
virtual double FromDisplay( double aValue, COORD_TYPES_T aCoordType ) override; virtual double FromDisplay( double aValue, COORD_TYPES_T aCoordType ) const override;
/** /**

8
pcbnew/pcb_view.cpp
View File

@ -90,13 +90,13 @@ void PCB_VIEW::Remove( KIGFX::VIEW_ITEM* aItem )
} }
void PCB_VIEW::Update( KIGFX::VIEW_ITEM* aItem, int aUpdateFlags ) void PCB_VIEW::Update( const KIGFX::VIEW_ITEM* aItem, int aUpdateFlags ) const
{ {
BOARD_ITEM* item = static_cast<BOARD_ITEM*>( aItem ); const BOARD_ITEM* item = static_cast<const BOARD_ITEM*>( aItem );
if( item->Type() == PCB_MODULE_T ) if( item->Type() == PCB_MODULE_T )
{ {
MODULE* mod = static_cast<MODULE*>( item ); const MODULE* mod = static_cast<const MODULE*>( item );
mod->RunOnChildren( [this, aUpdateFlags] ( BOARD_ITEM* aModItem ) mod->RunOnChildren( [this, aUpdateFlags] ( BOARD_ITEM* aModItem )
{ {
@ -108,7 +108,7 @@ void PCB_VIEW::Update( KIGFX::VIEW_ITEM* aItem, int aUpdateFlags )
} }
void PCB_VIEW::Update( KIGFX::VIEW_ITEM* aItem ) void PCB_VIEW::Update( const KIGFX::VIEW_ITEM* aItem ) const
{ {
PCB_VIEW::Update( aItem, KIGFX::ALL ); PCB_VIEW::Update( aItem, KIGFX::ALL );
} }

4
pcbnew/pcb_view.h
View File

@ -46,10 +46,10 @@ public:
virtual void Remove( VIEW_ITEM* aItem ) override; virtual void Remove( VIEW_ITEM* aItem ) override;
/// @copydoc VIEW::Update() /// @copydoc VIEW::Update()
virtual void Update( VIEW_ITEM* aItem, int aUpdateFlags ) override; virtual void Update( const VIEW_ITEM* aItem, int aUpdateFlags ) const override;
/// @copydoc VIEW::Update() /// @copydoc VIEW::Update()
virtual void Update( VIEW_ITEM* aItem ) override; virtual void Update( const VIEW_ITEM* aItem ) const override;
void UpdateDisplayOptions( const PCB_DISPLAY_OPTIONS& aOptions ); void UpdateDisplayOptions( const PCB_DISPLAY_OPTIONS& aOptions );
}; };

14
pcbnew/router/pns_index.h
View File

@ -78,7 +78,7 @@ public:
* @return number of items found. * @return number of items found.
*/ */
template<class Visitor> template<class Visitor>
int Query( const ITEM* aItem, int aMinDistance, Visitor& aVisitor ); int Query( const ITEM* aItem, int aMinDistance, Visitor& aVisitor ) const;
/** /**
* Searches items in the index that are in proximity of aShape. * Searches items in the index that are in proximity of aShape.
@ -92,7 +92,7 @@ public:
* @return number of items found. * @return number of items found.
*/ */
template<class Visitor> template<class Visitor>
int Query( const SHAPE* aShape, int aMinDistance, Visitor& aVisitor ); int Query( const SHAPE* aShape, int aMinDistance, Visitor& aVisitor ) const;
/** /**
* Returns list of all items in a given net. * Returns list of all items in a given net.
@ -120,7 +120,7 @@ public:
private: private:
template <class Visitor> template <class Visitor>
int querySingle( std::size_t aIndex, const SHAPE* aShape, int aMinDistance, Visitor& aVisitor ); int querySingle( std::size_t aIndex, const SHAPE* aShape, int aMinDistance, Visitor& aVisitor ) const;
std::deque<ITEM_SHAPE_INDEX> m_subIndices; std::deque<ITEM_SHAPE_INDEX> m_subIndices;
std::map<int, NET_ITEMS_LIST> m_netMap; std::map<int, NET_ITEMS_LIST> m_netMap;
@ -129,16 +129,16 @@ private:
template<class Visitor> template<class Visitor>
int INDEX::querySingle( std::size_t aIndex, const SHAPE* aShape, int aMinDistance, Visitor& aVisitor ) int INDEX::querySingle( std::size_t aIndex, const SHAPE* aShape, int aMinDistance, Visitor& aVisitor ) const
{ {
if( aIndex >= m_subIndices.size() ) if( aIndex >= m_subIndices.size() )
return 0; return 0;
return m_subIndices[aIndex].Query( aShape, aMinDistance, aVisitor, false ); return m_subIndices[aIndex].Query( aShape, aMinDistance, aVisitor);
} }
template<class Visitor> template<class Visitor>
int INDEX::Query( const ITEM* aItem, int aMinDistance, Visitor& aVisitor ) int INDEX::Query( const ITEM* aItem, int aMinDistance, Visitor& aVisitor ) const
{ {
int total = 0; int total = 0;
@ -151,7 +151,7 @@ int INDEX::Query( const ITEM* aItem, int aMinDistance, Visitor& aVisitor )
} }
template<class Visitor> template<class Visitor>
int INDEX::Query( const SHAPE* aShape, int aMinDistance, Visitor& aVisitor ) int INDEX::Query( const SHAPE* aShape, int aMinDistance, Visitor& aVisitor ) const
{ {
int total = 0; int total = 0;

4
pcbnew/tools/selection_tool.h
View File

@ -179,7 +179,7 @@ public:
///> Zooms the screen to center and fit the current selection. ///> Zooms the screen to center and fit the current selection.
void zoomFitSelection(); void zoomFitSelection();
BOARD* GetBoard() BOARD* GetBoard() const
{ {
return board(); return board();
} }
@ -394,4 +394,4 @@ private:
std::unique_ptr<PRIV> m_priv; std::unique_ptr<PRIV> m_priv;
}; };
#endif #endif /* __SELECTION_TOOL_H */

8
pcbnew/widgets/appearance_controls.cpp
View File

@ -208,18 +208,18 @@ NET_GRID_ENTRY& NET_GRID_TABLE::GetEntry( int aRow )
} }
int NET_GRID_TABLE::GetRowByNetcode( int aCode ) int NET_GRID_TABLE::GetRowByNetcode( int aCode ) const
{ {
auto it = std::find_if( m_nets.begin(), m_nets.end(), auto it = std::find_if( m_nets.cbegin(), m_nets.cend(),
[aCode]( const NET_GRID_ENTRY& aEntry ) [aCode]( const NET_GRID_ENTRY& aEntry )
{ {
return aEntry.code == aCode; return aEntry.code == aCode;
} ); } );
if( it == m_nets.end() ) if( it == m_nets.cend() )
return -1; return -1;
return std::distance( m_nets.begin(), it ); return std::distance( m_nets.cbegin(), it );
} }

2
pcbnew/widgets/appearance_controls.h
View File

@ -112,7 +112,7 @@ public:
NET_GRID_ENTRY& GetEntry( int aRow ); NET_GRID_ENTRY& GetEntry( int aRow );
int GetRowByNetcode( int aCode ); int GetRowByNetcode( int aCode ) const;
void Rebuild(); void Rebuild();