diff options
| author | nyamatongwe <nyamatongwe@gmail.com> | 2013-09-10 15:35:32 +1000 |
|---|---|---|
| committer | nyamatongwe <nyamatongwe@gmail.com> | 2013-09-10 15:35:32 +1000 |
| commit | 8dd25346bdaea0aa12ee83d35624d9d2c045af9a (patch) | |
| tree | d0c65abb1138169d15531e10f98d7f21baac280b | |
| parent | a1edd2b133bf3ae4d263cea2f46aacb4b51fccb5 (diff) | |
| download | scintilla-mirror-8dd25346bdaea0aa12ee83d35624d9d2c045af9a.tar.gz | |
Fix variable shadowing issues.
| -rw-r--r-- | lexlib/StyleContext.h | 4 | ||||
| -rw-r--r-- | src/ViewStyle.cxx | 4 | ||||
| -rw-r--r-- | src/ViewStyle.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lexlib/StyleContext.h b/lexlib/StyleContext.h index 73b7b515a..12d69d8f2 100644 --- a/lexlib/StyleContext.h +++ b/lexlib/StyleContext.h @@ -172,11 +172,11 @@ public: } int diffRelative = n - offsetRelative; int posNew = multiByteAccess->GetRelativePosition(posRelative, diffRelative); - int ch = multiByteAccess->GetCharacterAndWidth(posNew, 0); + int chReturn = multiByteAccess->GetCharacterAndWidth(posNew, 0); posRelative = posNew; currentPosLastRelative = currentPos; offsetRelative = n; - return ch; + return chReturn; } else { // fast version for single byte encodings return static_cast<unsigned char>(styler.SafeGetCharAt(currentPos + n, 0)); diff --git a/src/ViewStyle.cxx b/src/ViewStyle.cxx index 5e2ad1ee7..daa5b1a99 100644 --- a/src/ViewStyle.cxx +++ b/src/ViewStyle.cxx @@ -324,7 +324,7 @@ void ViewStyle::Refresh(Surface &surface, int tabInChars) { } maxAscent = 1; maxDescent = 1; - FindMaxAscentDescent(maxAscent, maxDescent); + FindMaxAscentDescent(); maxAscent += extraAscent; maxDescent += extraDescent; lineHeight = maxAscent + maxDescent; @@ -514,7 +514,7 @@ FontRealised *ViewStyle::Find(const FontSpecification &fs) { return 0; } -void ViewStyle::FindMaxAscentDescent(unsigned int &maxAscent, unsigned int &maxDescent) { +void ViewStyle::FindMaxAscentDescent() { for (FontMap::const_iterator it = fonts.begin(); it != fonts.end(); ++it) { if (maxAscent < it->second->ascent) maxAscent = it->second->ascent; diff --git a/src/ViewStyle.h b/src/ViewStyle.h index 244f5c508..3fbe2d751 100644 --- a/src/ViewStyle.h +++ b/src/ViewStyle.h @@ -180,7 +180,7 @@ private: void AllocStyles(size_t sizeNew); void CreateFont(const FontSpecification &fs); FontRealised *Find(const FontSpecification &fs); - void FindMaxAscentDescent(unsigned int &maxAscent, unsigned int &maxDescent); + void FindMaxAscentDescent(); // Private so can only be copied through copy constructor which ensures font names initialised correctly ViewStyle &operator=(const ViewStyle &); }; |