diff options
author | Neil <nyamatongwe@gmail.com> | 2018-04-28 10:12:11 +1000 |
---|---|---|
committer | Neil <nyamatongwe@gmail.com> | 2018-04-28 10:12:11 +1000 |
commit | 3173850f9261c9af83c91e92450879b233565670 (patch) | |
tree | d34a62c740f03047a191607f50b03d4706bf4965 | |
parent | 7b368356d901a89af7ce090459680280f7122672 (diff) | |
download | scintilla-mirror-3173850f9261c9af83c91e92450879b233565670.tar.gz |
Rename method to avoid confusion between base and derived classes.
-rw-r--r-- | src/Style.cxx | 6 | ||||
-rw-r--r-- | src/Style.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/Style.cxx b/src/Style.cxx index cf61eb222..40586b916 100644 --- a/src/Style.cxx +++ b/src/Style.cxx @@ -60,10 +60,10 @@ bool FontSpecification::operator<(const FontSpecification &other) const { } FontMeasurements::FontMeasurements() { - Clear(); + ClearMeasurements(); } -void FontMeasurements::Clear() { +void FontMeasurements::ClearMeasurements() { ascent = 1; descent = 1; capitalHeight = 1; @@ -140,7 +140,7 @@ void Style::Clear(ColourDesired fore_, ColourDesired back_, int size_, changeable = changeable_; hotspot = hotspot_; font.ClearFont(); - FontMeasurements::Clear(); + FontMeasurements::ClearMeasurements(); } void Style::ClearTo(const Style &source) { diff --git a/src/Style.h b/src/Style.h index e119bc65e..51ab5d3e6 100644 --- a/src/Style.h +++ b/src/Style.h @@ -49,7 +49,7 @@ struct FontMeasurements { XYPOSITION spaceWidth; int sizeZoomed; FontMeasurements(); - void Clear(); + void ClearMeasurements(); }; /** |