The time_t type seems to be an unsigned type when compiling with MSVC.

[lyx.git] / src / frontends / FontMetrics.h

diff --git a/src/frontends/FontMetrics.h b/src/frontends/FontMetrics.h
index 04a6f7c7cf84d6292772f503b8729410458e535a..59de63088c17c7d7cacfd833105a3209329f4e9e 100644 (file)
--- a/src/frontends/FontMetrics.h
+++ b/src/frontends/FontMetrics.h
@@ -14,7 +14,7 @@
 #ifndef FONT_METRICS_H
 #define FONT_METRICS_H
 
-#include "support/docstring.h"
+#include "support/strfwd.h"
 
 /**
  * A class holding helper functions for determining
@@ -97,15 +97,10 @@ public:
                int & descent) const = 0;
 
        /// return the maximum descent of the font
-       inline int maxHeight() const {
-               return maxAscent() + maxDescent();
-       }
+       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);
-       }
+       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 {
@@ -117,9 +112,11 @@ public:
 } // namespace frontend
 
 class Font;
+class FontInfo;
 
 /// Implementation is in Application.cpp
 frontend::FontMetrics const & theFontMetrics(Font const & f);
+frontend::FontMetrics const & theFontMetrics(FontInfo const & fi);
 
 } // namespace lyx