diff options
| author | Neil <unknown> | 2014-07-23 12:57:02 +1000 |
|---|---|---|
| committer | Neil <unknown> | 2014-07-23 12:57:02 +1000 |
| commit | fcdd797b0edfda0e6bbc89f7848c32094efe6669 (patch) | |
| tree | ccfc7faecafdf9dc71e18e0cee67f3be36e43516 /src/ContractionState.cxx | |
| parent | fcf7dc58d3dad7efabdcf503512b0729960d5d1a (diff) | |
| download | scintilla-mirror-fcdd797b0edfda0e6bbc89f7848c32094efe6669.tar.gz | |
Avoid shadowed names mostly in method prototypes. Turn off shadow
warnings for lexers since they may be maintained by others.
Diffstat (limited to 'src/ContractionState.cxx')
| -rw-r--r-- | src/ContractionState.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/ContractionState.cxx b/src/ContractionState.cxx index a5ecfe113..7b7655420 100644 --- a/src/ContractionState.cxx +++ b/src/ContractionState.cxx @@ -150,8 +150,8 @@ bool ContractionState::GetVisible(int lineDoc) const { } } -bool ContractionState::SetVisible(int lineDocStart, int lineDocEnd, bool visible_) { - if (OneToOne() && visible_) { +bool ContractionState::SetVisible(int lineDocStart, int lineDocEnd, bool isVisible) { + if (OneToOne() && isVisible) { return false; } else { EnsureData(); @@ -159,9 +159,9 @@ bool ContractionState::SetVisible(int lineDocStart, int lineDocEnd, bool visible Check(); if ((lineDocStart <= lineDocEnd) && (lineDocStart >= 0) && (lineDocEnd < LinesInDoc())) { for (int line = lineDocStart; line <= lineDocEnd; line++) { - if (GetVisible(line) != visible_) { - int difference = visible_ ? heights->ValueAt(line) : -heights->ValueAt(line); - visible->SetValueAt(line, visible_ ? 1 : 0); + if (GetVisible(line) != isVisible) { + int difference = isVisible ? heights->ValueAt(line) : -heights->ValueAt(line); + visible->SetValueAt(line, isVisible ? 1 : 0); displayLines->InsertText(line, difference); delta += difference; } @@ -191,13 +191,13 @@ bool ContractionState::GetExpanded(int lineDoc) const { } } -bool ContractionState::SetExpanded(int lineDoc, bool expanded_) { - if (OneToOne() && expanded_) { +bool ContractionState::SetExpanded(int lineDoc, bool isExpanded) { + if (OneToOne() && isExpanded) { return false; } else { EnsureData(); - if (expanded_ != (expanded->ValueAt(lineDoc) == 1)) { - expanded->SetValueAt(lineDoc, expanded_ ? 1 : 0); + if (isExpanded != (expanded->ValueAt(lineDoc) == 1)) { + expanded->SetValueAt(lineDoc, isExpanded ? 1 : 0); Check(); return true; } else { |