Backport: Rename method to avoid confusion between base and derived classes.

Backport of changeset 6755:fbf0bafc51db.

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();
 };
 
 /**