[LyX/master] Cleanup: fix comments, move declarations around

[Jean-Marc Lasgouttes]

commit ca2706e30ecb8d2de1508a120478aac0535e8cb6
Author: Jean-Marc Lasgouttes <lasgouttes at lyx.org>
Date:   Wed Jun 9 15:49:01 2021 +0200

    Cleanup: fix comments, move declarations around
---
 src/frontends/FontMetrics.h         |   25 ++++++++++++-------------
 src/frontends/qt/GuiFontMetrics.cpp |    1 +
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/frontends/FontMetrics.h b/src/frontends/FontMetrics.h
index d6e6354..2a6ffea 100644
--- a/src/frontends/FontMetrics.h
+++ b/src/frontends/FontMetrics.h
@@ -80,20 +80,30 @@ public:
 	/// return slope for italic font
 	virtual double italicSlope() const = 0;
 
-	/// return the width of the char in the font
-	virtual int width(char_type c) const = 0;
 	/// return the ascent of the char in the font
 	virtual int ascent(char_type c) const = 0;
 	/// return the descent of the char in the font
 	virtual int descent(char_type c) const = 0;
+	/// return the maximum height of the font
+	inline int maxHeight() const { return maxAscent() + maxDescent(); }
+	/// return the height of the char in the font
+	inline int height(char_type c) const { return ascent(c) + descent(c); }
+
 	/// return the left bearing of the char in the font
 	virtual int lbearing(char_type c) const = 0;
 	/// return the right bearing of the char in the font
 	virtual int rbearing(char_type c) const = 0;
+	/// return the width of the char in the font
+	virtual int width(char_type c) const = 0;
 	/// return the width of the string in the font
 	virtual int width(docstring const & s) const = 0;
 	/// FIXME ??
 	virtual int signedWidth(docstring const & s) const = 0;
+	/// return the inner width of the char in the font
+	inline int center(char_type c) const {
+		return (rbearing(c) - lbearing(c)) / 2;
+	}
+
 	/**
 	 * return the x offset of a position in the string. The
 	 * direction of the string is forced, and the returned value
@@ -139,17 +149,6 @@ public:
 		int & ascent,
 		int & descent) const = 0;
 
-	/// return the maximum descent of the font
-	inline int maxHeight() const { return maxAscent() + maxDescent(); }
-
-	/// return the descent of the char in the font
-	inline int height(char_type c) const { return ascent(c) + descent(c); }
-
-	/// return the inner width of the char in the font
-	inline int center(char_type c) const {
-		return (rbearing(c) - lbearing(c)) / 2;
-	}
-
 	/// return the number of expanding characters taken into account for
 	/// increased inter-word spacing during justification
 	virtual int countExpanders(docstring const & str) const = 0;
diff --git a/src/frontends/qt/GuiFontMetrics.cpp b/src/frontends/qt/GuiFontMetrics.cpp
index dffa827..7d72820 100644
--- a/src/frontends/qt/GuiFontMetrics.cpp
+++ b/src/frontends/qt/GuiFontMetrics.cpp
@@ -153,6 +153,7 @@ int GuiFontMetrics::maxDescent() const
 {
 	// We add 1 as the value returned by QT is different than X
 	// See http://doc.trolltech.com/2.3/qfontmetrics.html#200b74
+	// FIXME: check this
 	return metrics_.descent() + 1;
 }