Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2026-01-02 14:17:07 +01:00
Code Issues Releases Wiki Activity

Fix C4458 Warnings

Browse Source 
C4458 is 'Declaration hides class member'
This commit is contained in:
James Crook
2018-10-10 19:44:31 +01:00
parent 657159d542
commit 7e5a716e65
8 changed files with 59 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/toolbars/ToolDock.cpp
View File

@@ -733,7 +733,7 @@ ToolBarConfiguration::Position
void ModifySize
(ToolBar *ct,
const wxRect &rect,
const wxRect &rectIn,
ToolBarConfiguration::Position prevPosition,
ToolBarConfiguration::Position position,
wxSize &sz)
@@ -743,16 +743,16 @@ ToolBarConfiguration::Position
// and is in the right place.
// Does the location fall within this bar?
if (rect.Contains(point))
if (rectIn.Contains(point))
{
sz = tb->GetDockedSize();
// Choose a position always, if there is a bar to displace.
// Else, only if the fit is possible.
if (ct || (sz.x <= rect.width && sz.y <= rect.height)) {
if (ct || (sz.x <= rectIn.width && sz.y <= rectIn.height)) {
// May choose current or previous.
if (ct &&
(sz.y < rect.height ||
point.y < (rect.GetTop() + rect.GetBottom()) / 2))
(sz.y < rectIn.height ||
point.y < (rectIn.GetTop() + rectIn.GetBottom()) / 2))
// "Wedge" the bar into a crack alone, not adopting others,
// if either a short bar displaces a tall one, or else
// the displacing bar is at least at tall, but the pointer is
@@ -766,13 +766,13 @@ ToolBarConfiguration::Position
}
void Visit
(ToolBar *, wxPoint point)
(ToolBar *, wxPoint pointIn)
override
{
if (result != ToolBarConfiguration::UnspecifiedPosition) {
// If we've placed it, we're done.
rect.x = point.x;
rect.y = point.y;
rect.x = pointIn.x;
rect.y = pointIn.y;
if (usedPrev)
rect.y -= tb->GetDockedSize().GetHeight() / 2;
@@ -792,8 +792,8 @@ ToolBarConfiguration::Position
if (result == ToolBarConfiguration::UnspecifiedPosition) {
// Default of all other placements.
result = finalPosition;
wxPoint point { finalRect.GetLeft(), finalRect.GetBottom() };
rect.SetPosition(point);
wxPoint point1 { finalRect.GetLeft(), finalRect.GetBottom() };
rect.SetPosition(point1);
}
}