From f4e37e57e472622ecfb8b34c0fe6110ad35e9420 Mon Sep 17 00:00:00 2001 From: Artur Wieczorek Date: Sun, 16 Jun 2019 18:05:03 +0200 Subject: [PATCH] Get rid of unnecessary const casts A pointer to unqualified type are converted implicitly to a more cv-qualified type. --- include/wx/propgrid/editors.h | 2 +- include/wx/propgrid/manager.h | 2 +- include/wx/propgrid/propgrid.h | 2 +- include/wx/propgrid/propgridiface.h | 2 +- include/wx/propgrid/propgridpagestate.h | 2 +- include/wx/propgrid/props.h | 2 +- src/propgrid/property.cpp | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/wx/propgrid/editors.h b/include/wx/propgrid/editors.h index 3e4ed10d33..42e1214a9d 100644 --- a/include/wx/propgrid/editors.h +++ b/include/wx/propgrid/editors.h @@ -460,7 +460,7 @@ public: wxWindow* GetButton( unsigned int i ) { return m_buttons[i]; } const wxWindow* GetButton( unsigned int i ) const - { return const_cast(m_buttons[i]); } + { return m_buttons[i]; } // Utility function to be used in event handlers. int GetButtonId( unsigned int i ) const { return GetButton(i)->GetId(); } diff --git a/include/wx/propgrid/manager.h b/include/wx/propgrid/manager.h index ebdd4df337..1408d4b0ba 100644 --- a/include/wx/propgrid/manager.h +++ b/include/wx/propgrid/manager.h @@ -270,7 +270,7 @@ public: const wxPropertyGrid* GetGrid() const { wxASSERT(m_pPropGrid); - return const_cast(m_pPropGrid); + return m_pPropGrid; } // Returns iterator class instance. diff --git a/include/wx/propgrid/propgrid.h b/include/wx/propgrid/propgrid.h index a92735e2cb..dc7111517f 100644 --- a/include/wx/propgrid/propgrid.h +++ b/include/wx/propgrid/propgrid.h @@ -1162,7 +1162,7 @@ public: const wxPGCommonValue* GetCommonValue( unsigned int i ) const { - return const_cast(m_commonValues[i]); + return m_commonValues[i]; } // Returns number of common values. diff --git a/include/wx/propgrid/propgridiface.h b/include/wx/propgrid/propgridiface.h index a3c47f2237..b5ced1bf31 100644 --- a/include/wx/propgrid/propgridiface.h +++ b/include/wx/propgrid/propgridiface.h @@ -305,7 +305,7 @@ public: const wxPGProperty* GetFirst( int flags = wxPG_ITERATE_ALL ) const { - return const_cast(GetFirst(flags)); + return GetFirst(flags); } // Returns pointer to a property with given name (case-sensitive). diff --git a/include/wx/propgrid/propgridpagestate.h b/include/wx/propgrid/propgridpagestate.h index 81c8ccaf5b..ce72e8ec5c 100644 --- a/include/wx/propgrid/propgridpagestate.h +++ b/include/wx/propgrid/propgridpagestate.h @@ -412,7 +412,7 @@ public: const wxPGProperty* GetLastItem( int flags = wxPG_ITERATE_DEFAULT ) const { - return const_cast(GetLastItem(flags)); + return GetLastItem(flags); } // Returns currently selected property. diff --git a/include/wx/propgrid/props.h b/include/wx/propgrid/props.h index bd18d0c422..41d9e97035 100644 --- a/include/wx/propgrid/props.h +++ b/include/wx/propgrid/props.h @@ -771,7 +771,7 @@ bool PROPNAME::OnEvent( wxPropertyGrid* propgrid, \ wxWindow* primary, wxEvent& event ) \ { \ if ( event.GetEventType() == wxEVT_BUTTON ) \ - return OnButtonClick(propgrid,primary, const_cast(CUSTBUTTXT)); \ + return OnButtonClick(propgrid,primary, CUSTBUTTXT); \ return false; \ } diff --git a/src/propgrid/property.cpp b/src/propgrid/property.cpp index 8cee3bc522..0efd257c5c 100644 --- a/src/propgrid/property.cpp +++ b/src/propgrid/property.cpp @@ -2729,7 +2729,7 @@ bool wxPGProperty::AreAllChildrenSpecified( wxVariant* pendingList ) const for ( ; node != pList->end(); ++node ) { - const wxVariant& item = *const_cast(*node); + const wxVariant& item = **node; if ( item.GetName() == childName ) { listValue = &item;