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 | bbfea9ca4e14961ecad7bd62acc868c0f4a2adaa (patch) | |
| tree | 4286e0bcc319d86a3d355ee79688503ef1bb4db6 /src | |
| parent | 8ba6c4c8e180b7506d1cb4f012aac253b3da6750 (diff) | |
| download | scintilla-mirror-bbfea9ca4e14961ecad7bd62acc868c0f4a2adaa.tar.gz | |
Fix variable shadowing issues.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ViewStyle.cxx | 4 | ||||
| -rw-r--r-- | src/ViewStyle.h | 2 |
2 files changed, 3 insertions, 3 deletions
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 &); }; |