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 | 774bb684b2afbf1637f7fa29e13fd901d15681d6 (patch) | |
| tree | aa9648519523e19b14a39ecf84c2cfdedd426b83 /src/Style.cxx | |
| parent | 6d08a4cb98cb6351ad8cdded482e46a2a9c12113 (diff) | |
| download | scintilla-mirror-774bb684b2afbf1637f7fa29e13fd901d15681d6.tar.gz | |
Backport: Rename method to avoid confusion between base and derived classes.
Backport of changeset 6755:fbf0bafc51db.
Diffstat (limited to 'src/Style.cxx')
| -rw-r--r-- | src/Style.cxx | 6 |
1 files changed, 3 insertions, 3 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) { |