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

Fix harmless parameter shadowing warnings

Browse Source 
Rename local variables to avoid clashes with the function parameters.

Closes #17343, #17344.
This commit is contained in:
pb101
2016-01-22 14:41:23 +01:00
committed by Vadim Zeitlin
parent 78b19e6811
commit a03df746f0
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/txtstrm.cpp
View File

@@ -543,8 +543,8 @@ wxTextOutputStream& wxTextOutputStream::PutChar(wxChar c)
{ {
for ( size_t n = 0; n < len; n++ ) for ( size_t n = 0; n < len; n++ )
{ {
const char c = buffer[n]; const char c2 = buffer[n];
if ( c == '\n' ) if ( c2 == '\n' )
{ {
switch ( m_mode ) 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 #else // SIZEOF_WCHAR_T == 4

8
src/msw/toolbar.cpp
View File

@@ -633,14 +633,14 @@ bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
wxToolBarToolsList::compatibility_iterator node; wxToolBarToolsList::compatibility_iterator node;
for ( node = m_tools.Find(tool); node; node = node->GetNext() ) 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; continue;
if ( tool->IsControl() ) if ( ctool->IsControl() )
{ {
tool->MoveBy(-delta); ctool->MoveBy(-delta);
} }
} }