Fix harmless parameter shadowing warnings
Rename local variables to avoid clashes with the function parameters. Closes #17343, #17344.
This commit is contained in:
@@ -543,8 +543,8 @@ wxTextOutputStream& wxTextOutputStream::PutChar(wxChar c)
|
||||
{
|
||||
for ( size_t n = 0; n < len; n++ )
|
||||
{
|
||||
const char c = buffer[n];
|
||||
if ( c == '\n' )
|
||||
const char c2 = buffer[n];
|
||||
if ( c2 == '\n' )
|
||||
{
|
||||
switch ( m_mode )
|
||||
{
|
||||
@@ -566,7 +566,7 @@ wxTextOutputStream& wxTextOutputStream::PutChar(wxChar c)
|
||||
}
|
||||
}
|
||||
|
||||
m_output.Write(&c, 1);
|
||||
m_output.Write(&c2, 1);
|
||||
}
|
||||
}
|
||||
#else // SIZEOF_WCHAR_T == 4
|
||||
|
@@ -633,14 +633,14 @@ bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
|
||||
wxToolBarToolsList::compatibility_iterator node;
|
||||
for ( node = m_tools.Find(tool); node; node = node->GetNext() )
|
||||
{
|
||||
wxToolBarTool * const tool = static_cast<wxToolBarTool*>(node->GetData());
|
||||
wxToolBarTool * const ctool = static_cast<wxToolBarTool*>(node->GetData());
|
||||
|
||||
if ( tool->IsToBeDeleted() )
|
||||
if ( ctool->IsToBeDeleted() )
|
||||
continue;
|
||||
|
||||
if ( tool->IsControl() )
|
||||
if ( ctool->IsControl() )
|
||||
{
|
||||
tool->MoveBy(-delta);
|
||||
ctool->MoveBy(-delta);
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user