X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiFontMetrics.h;h=4f83c3807a96c288f1ed5b459fb8a51cc22570cd;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=d4c0786164fd0eb88322bc5cd046757616c39662;hpb=f8175cca5eaf70bfdf5daa745afe5821d9ce9e6a;p=lyx.git

diff --git a/src/frontends/qt4/GuiFontMetrics.h b/src/frontends/qt4/GuiFontMetrics.h
index d4c0786164..4f83c3807a 100644
--- a/src/frontends/qt4/GuiFontMetrics.h
+++ b/src/frontends/qt4/GuiFontMetrics.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file FontMetrics.h
+ * \file GuiFontMetrics.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -9,8 +9,8 @@
  * Full author contact details are available in file CREDITS.
  */
 
-#ifndef QT4_FONT_METRICS_H
-#define QT4_FONT_METRICS_H
+#ifndef GUI_FONT_METRICS_H
+#define GUI_FONT_METRICS_H
 
 #include "frontends/FontMetrics.h"
 
@@ -19,14 +19,12 @@
 #include <QFontMetrics>
 #include <QHash>
 
-
 namespace lyx {
 namespace frontend {
 
-class GuiFontMetrics: public FontMetrics
+class GuiFontMetrics : public FontMetrics
 {
 public:
-
 	GuiFontMetrics(QFont const & font);
 	GuiFontMetrics(QFont const & font, QFont const & smallcaps_font);
 
@@ -74,7 +72,7 @@ private:
 	/// Cache of char ascends and descends
 	mutable QHash<char_type, AscendDescend> metrics_cache_;
 	/// fill in \c metrics_cache_ at specified value.
-	void fillMetricsCache(char_type) const;
+	AscendDescend const fillMetricsCache(char_type) const;
 
 	/// Cache of char right bearings
 	mutable QHash<char_type, int> rbearing_cache_;
@@ -83,4 +81,4 @@ private:
 } // namespace frontend
 } // namespace lyx
 
-#endif // QT4_FONT_METRICS_H
+#endif // GUI_FONT_METRICS_H