revert last patch. there's something wrong, possibly unrelated to this

[lyx.git] / src / mathed / MathSupport.h

diff --git a/src/mathed/MathSupport.h b/src/mathed/MathSupport.h
index 09954960a79dc4fab98d76d81db922d1d29440ba..ead1e095aad2cf34a4c24a44049c211d3a24a383 100644 (file)
--- a/src/mathed/MathSupport.h
+++ b/src/mathed/MathSupport.h
@@ -13,40 +13,38 @@
 #ifndef MATH_SUPPORT_H
 #define MATH_SUPPORT_H
 
-#include "support/docstring.h"
-
-#include <string>
+#include "support/strfwd.h"
 #include <vector>
 
 namespace lyx {
 
 class PainterInfo;
-class Font;
+class FontInfo;
 class Dimension;
 class MathData;
 class MathAtom;
 class InsetMath;
 
 
-int mathed_char_width(Font const &, char_type c);
+int mathed_char_width(FontInfo const &, char_type c);
 
-int mathed_char_kerning(Font const &, char_type c);
+int mathed_char_kerning(FontInfo const &, char_type c);
 
 void mathed_draw_deco(PainterInfo & pi, int x, int y, int w, int h,
        docstring const & name);
 
-void mathed_string_dim(Font const & font,
+void mathed_string_dim(FontInfo const & font,
                       docstring const & s,
                       Dimension & dim);
 
-int mathed_string_width(Font const &, docstring const & s);
+int mathed_string_width(FontInfo const &, docstring const & s);
 
 void drawStrRed(PainterInfo & pi, int x, int y, docstring const & s);
 void drawStrBlack(PainterInfo & pi, int x, int y, docstring const & s);
 
-void math_font_max_dim(Font const &, int & asc, int & desc);
+void math_font_max_dim(FontInfo const &, int & asc, int & desc);
 
-void augmentFont(Font & f, docstring const & cmd);
+void augmentFont(FontInfo & f, docstring const & cmd);
 
 bool isFontName(docstring const & name);