Rename files in src/mathed and src/graphics from .C to .cpp, step 2

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

diff --git a/src/mathed/MathSupport.h b/src/mathed/MathSupport.h
index 68fd49d6e10c52d911e3140bb74a61c2cf7833e9..b37d42bc33a01f47685c2fe0210c0a3c38ded029 100644 (file)
--- a/src/mathed/MathSupport.h
+++ b/src/mathed/MathSupport.h
@@ -13,7 +13,12 @@
 #ifndef MATH_SUPPORT_H
 #define MATH_SUPPORT_H
 
+#include "support/docstring.h"
+
 #include <string>
+#include <vector>
+
+namespace lyx {
 
 class PainterInfo;
 class LyXFont;
@@ -23,30 +28,36 @@ class MathAtom;
 class InsetMath;
 
 
-void mathed_char_dim(LyXFont const &, unsigned char c, Dimension & dim);
-int mathed_char_width(LyXFont const &, unsigned char c);
+int mathed_char_width(LyXFont const &, char_type c);
+
+int mathed_char_kerning(LyXFont const &, char_type c);
 
 void mathed_draw_deco(PainterInfo & pi, int x, int y, int w, int h,
-       std::string const & name);
+       docstring const & name);
 
-void mathed_string_dim(LyXFont const & font, std::string const & s, Dimension & dim);
-int mathed_string_width(LyXFont const &, std::string const & s);
+void mathed_string_dim(LyXFont const & font,
+                      docstring const & s,
+                      Dimension & dim);
 
-void drawStrRed(PainterInfo & pi, int x, int y, std::string const & s);
-void drawStrBlack(PainterInfo & pi, int x, int y, std::string const & s);
+int mathed_string_width(LyXFont 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(LyXFont const &, int & asc, int & desc);
 
-void augmentFont(LyXFont & f, std::string const & cmd);
+void augmentFont(LyXFont & f, docstring const & cmd);
 
-bool isFontName(std::string const & name);
+bool isFontName(docstring const & name);
 
 // converts single cell to string
-std::string asString(MathArray const & ar);
+docstring asString(MathArray const & ar);
 // converts single inset to string
-std::string asString(InsetMath const &);
-std::string asString(MathAtom const &);
+docstring asString(InsetMath const &);
+docstring asString(MathAtom const &);
 // converts string to single cell
-void asArray(std::string const & str, MathArray & ar);
+void asArray(docstring const & str, MathArray & ar);
+
+} // namespace lyx
 
 #endif