fix #1073

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

diff --git a/src/mathed/math_data.h b/src/mathed/math_data.h
index b4fa7785d4685dc2dfadc84874356da79b5d9d68..e66b7ca9d6a668db4475ad6bd0783ed7a1c50945 100644 (file)
--- a/src/mathed/math_data.h
+++ b/src/mathed/math_data.h
@@ -26,15 +26,12 @@
 class MathMacro;
 class LaTeXFeatures;
 class ReplaceData;
-class MathMetricsInfo;
-class MathPainterInfo;
+class MetricsInfo;
+class PainterInfo;
 class TextMetricsInfo;
 class TextPainter;
 
 
-#ifdef __GNUG__
-#pragma interface
-#endif
 
 
 class MathArray : private std::vector<MathAtom> {
@@ -108,9 +105,9 @@ public:
        /// checked read access
        MathAtom const & operator[](pos_type) const;
        /// rebuild cached metrics information
-       Dimension const & metrics(MathMetricsInfo & mi) const;
+       Dimension const & metrics(MetricsInfo & mi) const;
        /// redraw cell using cache metrics information
-       void draw(MathPainterInfo & pi, int x, int y) const;
+       void draw(PainterInfo & pi, int x, int y) const;
        /// rebuild cached metrics information
        Dimension const & metricsT(TextMetricsInfo const & mi) const;
        /// redraw cell using cache metrics information
@@ -131,11 +128,11 @@ public:
        /// returns x coordinate of given position in the array
        int pos2x(size_type pos) const;
        /// returns position of given x coordinate
-       int pos2x(size_type pos1, size_type pos2, int glue) const;
+       int pos2x(size_type pos, int glue) const;
        /// returns position of given x coordinate
        size_type x2pos(int pos) const;
        /// returns position of given x coordinate fstarting from a certain pos
-       size_type x2pos(size_type startpos, int targetx, int glue) const;
+       size_type x2pos(int targetx, int glue) const;
        /// returns distance of this cell to the point given by x and y
        // assumes valid position and size cache
        int dist(int x, int y) const;