Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Eliminate -Wcast-qual warnings with GCC and Clang

Browse Source 
Use const_cast, mutable, and various other changes to avoid -Wcast-qual
This commit is contained in:
Paul Cornett
2020-02-02 22:50:32 -08:00
parent 6724f8c052
commit 948ddc6e0f
115 changed files with 273 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/propgrid/editors.cpp
View File

@@ -637,7 +637,8 @@ public:
}
else
{
pg->OnComboItemPaint( this, item, &dc, (wxRect&)rect, flags );
wxRect r(rect);
pg->OnComboItemPaint(this, item, &dc, r, flags);
}
}

2
src/propgrid/manager.cpp
View File

@@ -2201,7 +2201,7 @@ private:
wxPGVIterator wxPropertyGridManager::GetVIterator( int flags ) const
{
return wxPGVIterator( new wxPGVIteratorBase_Manager( (wxPropertyGridManager*)this, flags ) );
return wxPGVIterator(new wxPGVIteratorBase_Manager(const_cast<wxPropertyGridManager*>(this), flags));
}
#endif // wxUSE_PROPGRID

4
src/propgrid/propgrid.cpp
View File

@@ -1936,7 +1936,7 @@ void wxPropertyGrid::DrawExpanderButton( wxDC& dc, const wxRect& rect,
// Hopefully this does not cause problems.
#if (wxPG_USE_RENDERER_NATIVE)
wxRendererNative::Get().DrawTreeItemButton(
(wxWindow*)this,
const_cast<wxPropertyGrid*>(this),
dc,
r,
wxCONTROL_EXPANDED
@@ -1952,7 +1952,7 @@ void wxPropertyGrid::DrawExpanderButton( wxDC& dc, const wxRect& rect,
{
#if (wxPG_USE_RENDERER_NATIVE)
wxRendererNative::Get().DrawTreeItemButton(
(wxWindow*)this,
const_cast<wxPropertyGrid*>(this),
dc,
r,
0

6
src/propgrid/propgridpagestate.cpp
View File

@@ -432,7 +432,7 @@ wxPropertyCategory* wxPropertyGridPageState::GetPropertyCategory( const wxPGProp
parent = grandparent;
grandparent = parent->GetParent();
if ( parent->IsCategory() && grandparent )
return (wxPropertyCategory*)parent;
return const_cast<wxPropertyCategory*>(static_cast<const wxPropertyCategory*>(parent));
} while ( grandparent );
return NULL;
@@ -451,11 +451,11 @@ wxPGProperty* wxPropertyGridPageState::GetPropertyByLabel
#endif // WXWIN_COMPATIBILITY_3_0
wxPGProperty* wxPropertyGridPageState::BaseGetPropertyByLabel
( const wxString& label, wxPGProperty* parent ) const
( const wxString& label, const wxPGProperty* parent ) const
{
if ( !parent )
{
parent = (wxPGProperty*) &m_regularArray;
parent = &m_regularArray;
}
for ( size_t i=0; i<parent->GetChildCount(); i++ )