aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Style.cxx
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2018-04-28 10:12:11 +1000
committerNeil <nyamatongwe@gmail.com>2018-04-28 10:12:11 +1000
commit3173850f9261c9af83c91e92450879b233565670 (patch)
treed34a62c740f03047a191607f50b03d4706bf4965 /src/Style.cxx
parent7b368356d901a89af7ce090459680280f7122672 (diff)
downloadscintilla-mirror-3173850f9261c9af83c91e92450879b233565670.tar.gz
Rename method to avoid confusion between base and derived classes.
Diffstat (limited to 'src/Style.cxx')
-rw-r--r--src/Style.cxx6
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) {