make it compile again (hopefully)

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

diff --git a/src/mathed/MathData.h b/src/mathed/MathData.h
index 9889b1a2f0da4679042efa8580ff07538533bee5..9b679ad211aaec81d2dc3d2b020498309bb769e1 100644 (file)
--- a/src/mathed/MathData.h
+++ b/src/mathed/MathData.h
@@ -14,12 +14,14 @@
 #ifndef MATH_DATA_H
 #define MATH_DATA_H
 
-#include <iosfwd>
 #include <vector>
 
 #include "MathAtom.h"
 #include "dimension.h"
 
+#include "support/docstream.h"
+
+class BufferView;
 class LaTeXFeatures;
 class ReplaceData;
 class MetricsInfo;
@@ -112,15 +114,15 @@ public:
        void touch() const;
 
        /// access to cached x coordinate of last drawing
-       int xo() const;
+       int xo(BufferView & bv) const;
        /// access to cached y coordinate of last drawing
-       int yo() const;
+       int yo(BufferView & bv) const;
        /// access to cached x coordinate of mid point of last drawing
-       int xm() const { return xo() + dim_.wid / 2; }
+       int xm(BufferView & bv) const { return xo(bv) + dim_.wid / 2; }
        /// access to cached y coordinate of mid point of last drawing
-       int ym() const { return yo() + (dim_.des - dim_.asc) / 2; }
+       int ym(BufferView & bv) const { return yo(bv) + (dim_.des - dim_.asc) / 2; }
        /// write access to coordinate;
-       void setXY(int x, int y) const;
+       void setXY(BufferView & bv, int x, int y) const;
        /// returns x coordinate of given position in the array
        int pos2x(size_type pos) const;
        /// returns position of given x coordinate
@@ -131,7 +133,7 @@ public:
        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;
+       int dist(BufferView & bv, int x, int y) const;
 
        /// ascent of this cell above the baseline
        int ascent() const { return dim_.asc; }
@@ -156,6 +158,8 @@ private:
 
 ///
 std::ostream & operator<<(std::ostream & os, MathArray const & ar);
+///
+lyx::odocstream & operator<<(lyx::odocstream & os, MathArray const & ar);
 
 
 #endif