mathed uglyfication

[lyx.git] / src / mathed / math_inset.C

diff --git a/src/mathed/math_inset.C b/src/mathed/math_inset.C
index 0c4fae9707078b78e3a2430222d049a1b5136efe..fd56951bbc118e50b6b87083a5770f9aad43c82e 100644 (file)
--- a/src/mathed/math_inset.C
+++ b/src/mathed/math_inset.C
@@ -12,22 +12,15 @@
 #include <config.h>
 
 #include "math_inset.h"
+#include "math_data.h"
 #include "math_mathmlstream.h"
-#include "math_cursor.h"
 #include "debug.h"
 
-#include "formulabase.h"
-
+using std::string;
 using std::ostream;
 using std::endl;
 
 
-BufferView * MathInset::view() const
-{
-       return mathcursor ? mathcursor->formula()->view() : 0;
-}
-
-
 MathInset::size_type MathInset::nargs() const
 {
        return 0;
@@ -63,69 +56,69 @@ void MathInset::substitute(MathMacro const &)
 {}
 
 
-bool MathInset::idxNext(idx_type &, pos_type &) const
+bool MathInset::idxNext(BufferView &) const
 {
        return false;
 }
 
 
-bool MathInset::idxRight(idx_type &, pos_type &) const
+bool MathInset::idxRight(BufferView &) const
 {
        return false;
 }
 
 
-bool MathInset::idxPrev(idx_type &, pos_type &) const
+bool MathInset::idxPrev(BufferView &) const
 {
        return false;
 }
 
 
-bool MathInset::idxLeft(idx_type &, pos_type &) const
+bool MathInset::idxLeft(BufferView &) const
 {
        return false;
 }
 
 
-bool MathInset::idxUpDown(idx_type &, pos_type &, bool, int) const
+bool MathInset::idxUpDown(BufferView &, bool, int) const
 {
        return false;
 }
 
 
-bool MathInset::idxUpDown2(idx_type &, pos_type &, bool, int) const
+bool MathInset::idxUpDown2(BufferView &, bool, int) const
 {
        return false;
 }
 
 
-bool MathInset::idxFirst(idx_type &, pos_type &) const
+bool MathInset::idxFirst(BufferView &) const
 {
        return false;
 }
 
 
-bool MathInset::idxLast(idx_type &, pos_type &) const
+bool MathInset::idxLast(BufferView &) const
 {
        return false;
 }
 
 
-bool MathInset::idxHome(idx_type &, pos_type &) const
+bool MathInset::idxHome(BufferView &) const
 {
        return false;
 }
 
 
-bool MathInset::idxEnd(idx_type &, pos_type &) const
+bool MathInset::idxEnd(BufferView &) const
 {
        return false;
 }
 
 
-void MathInset::getPos(idx_type, pos_type, int & x, int & y) const
+void MathInset::getScreenPos(idx_type, pos_type, int & x, int & y) const
 {
-       lyxerr << "MathInset::getPos() called directly!" << endl;
+       lyxerr << "MathInset::getScreenPos() called directly!" << endl;
        x = y = 0;
 }
 
@@ -217,19 +210,19 @@ void MathInset::mathmlize(MathMLStream & os) const
 }
 
 
-int MathInset::ascii(std::ostream &, int) const
+int MathInset::plaintext(std::ostream &, OutputParams const &) const
 {
        return 0;
 }
 
 
-int MathInset::linuxdoc(std::ostream &) const
+int MathInset::linuxdoc(std::ostream &, OutputParams const &) const
 {
        return 0;
 }
 
 
-int MathInset::docbook(std::ostream &, bool) const
+int MathInset::docbook(std::ostream &, OutputParams const &) const
 {
        return 0;
 }