Adjust CMake for Qt5

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

diff --git a/src/frontends/FontMetrics.h b/src/frontends/FontMetrics.h
index 89890c1ba005ff9e7c3b6dab00cb7c41158752ce..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
@@ -74,7 +74,7 @@ public:
        /// return the right bearing of the char in the font
        virtual int rbearing(char_type c) const = 0;
        /// return the width of the string in the font
-       virtual int width(char_type const * s, size_t n) const = 0;
+       virtual int width(docstring const & s) const = 0;
        /// FIXME ??
        virtual int signedWidth(docstring const & s) const = 0;
        /// return char dimension for the font.
@@ -97,35 +97,26 @@ 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 {
                return (rbearing(c) - lbearing(c)) / 2;
        }
-
-       /// return the width of the string in the font
-       inline int width(docstring const & s) const
-       {
-           return s.empty() ? 0 : width(s.data(), s.length());
-       }
 };
 
 
 } // namespace frontend
 
-class LyXFont;
+class Font;
+class FontInfo;
 
-/// Implementation is in Application.C
-frontend::FontMetrics const & theFontMetrics(LyXFont const & f);
+/// Implementation is in Application.cpp
+frontend::FontMetrics const & theFontMetrics(Font const & f);
+frontend::FontMetrics const & theFontMetrics(FontInfo const & fi);
 
 } // namespace lyx