and some mathed de-uglyfication

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

diff --git a/src/mathed/math_inset.C b/src/mathed/math_inset.C
index 675126d418dd2e94535451991e1b165fafd5e1eb..33f2119d5006f8fe7bc98ea6abecdc6d126c48a7 100644 (file)
--- a/src/mathed/math_inset.C
+++ b/src/mathed/math_inset.C
@@ -1,40 +1,24 @@
-/*
- *  File:        math_inset.C
- *  Purpose:     Implementation of insets for mathed
- *  Author:      Alejandro Aguilar Sierra <asierra@servidor.unam.mx>
- *  Created:     January 1996
- *  Description:
+/**
+ * \file math_inset.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *  Dependencies: Xlib, XForms
+ * \author Alejandro Aguilar Sierra
+ * \author André Pönitz
  *
- *  Copyright: 1996, 1997 Alejandro Aguilar Sierra
- *
- *   Version: 0.8beta.
- *
- *   You are free to use and modify this code under the terms of
- *   the GNU General Public Licence version 2 or later.
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
 #include "math_inset.h"
-#include "math_scriptinset.h"
+#include "math_data.h"
 #include "math_mathmlstream.h"
-#include "math_cursor.h"
 #include "debug.h"
 
-#include "frontends/LyXView.h"
-#include "frontends/Dialogs.h"
-#include "BufferView.h"
-#include "formulabase.h"
-
+using std::string;
 using std::ostream;
-
-
-BufferView * MathInset::view() const
-{
-       return mathcursor ? mathcursor->formula()->view() : 0;
-}
+using std::endl;
 
 
 MathInset::size_type MathInset::nargs() const
@@ -47,14 +31,14 @@ MathArray dummyCell;
 
 MathArray & MathInset::cell(idx_type)
 {
-       lyxerr << "I don't have a cell 1\n";
+       lyxerr << "I don't have a cell 1" << endl;
        return dummyCell;
 }
 
 
 MathArray const & MathInset::cell(idx_type) const
 {
-       lyxerr << "I don't have a cell 2\n";
+       lyxerr << "I don't have a cell 2" << endl;
        return dummyCell;
 }
 
@@ -62,9 +46,9 @@ MathArray const & MathInset::cell(idx_type) const
 MathInset::idx_type MathInset::index(row_type row, col_type col) const
 {
        if (row != 0)
-               lyxerr << "illegal row: " << row << "\n";
+               lyxerr << "illegal row: " << row << endl;
        if (col != 0)
-               lyxerr << "illegal col: " << col << "\n";
+               lyxerr << "illegal col: " << col << endl;
        return 0;
 }
 
@@ -72,79 +56,79 @@ void MathInset::substitute(MathMacro const &)
 {}
 
 
-bool MathInset::idxNext(idx_type &, pos_type &) const
+bool MathInset::idxNext(LCursor &) const
 {
        return false;
 }
 
 
-bool MathInset::idxRight(idx_type &, pos_type &) const
+bool MathInset::idxRight(LCursor &) const
 {
        return false;
 }
 
 
-bool MathInset::idxPrev(idx_type &, pos_type &) const
+bool MathInset::idxPrev(LCursor &) const
 {
        return false;
 }
 
 
-bool MathInset::idxLeft(idx_type &, pos_type &) const
+bool MathInset::idxLeft(LCursor &) const
 {
        return false;
 }
 
 
-bool MathInset::idxUpDown(idx_type &, pos_type &, bool, int) const
+bool MathInset::idxUpDown(LCursor &, bool, int) const
 {
        return false;
 }
 
 
-bool MathInset::idxUpDown2(idx_type &, pos_type &, bool, int) const
+bool MathInset::idxUpDown2(LCursor &, bool, int) const
 {
        return false;
 }
 
 
-bool MathInset::idxFirst(idx_type &, pos_type &) const
+bool MathInset::idxFirst(LCursor &) const
 {
        return false;
 }
 
 
-bool MathInset::idxLast(idx_type &, pos_type &) const
+bool MathInset::idxLast(LCursor &) const
 {
        return false;
 }
 
 
-bool MathInset::idxHome(idx_type &, pos_type &) const
+bool MathInset::idxHome(LCursor &) const
 {
        return false;
 }
 
 
-bool MathInset::idxEnd(idx_type &, pos_type &) const
+bool MathInset::idxEnd(LCursor &) 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!\n";
+       lyxerr << "MathInset::getScreenPos() called directly!" << endl;
        x = y = 0;
 }
 
 
 void MathInset::dump() const
 {
-       lyxerr << "---------------------------------------------\n";
+       lyxerr << "---------------------------------------------" << endl;
        WriteStream wi(lyxerr, false, true);
        write(wi);
-       lyxerr << "\n---------------------------------------------\n";
+       lyxerr << "\n---------------------------------------------" << endl;
 }
 
 
@@ -157,14 +141,14 @@ bool MathInset::idxBetween(idx_type idx, idx_type from, idx_type to) const
 void MathInset::drawSelection(PainterInfo &,
        idx_type, pos_type, idx_type, pos_type) const
 {
-       lyxerr << "MathInset::drawSelection() called directly!\n";
+       lyxerr << "MathInset::drawSelection() called directly!" << endl;
 }
 
 
 void MathInset::metricsT(TextMetricsInfo const &, Dimension &) const
 {
 #ifdef WITH_WARNINGS
-       lyxerr << "MathInset::metricsT(Text) called directly!\n";
+       lyxerr << "MathInset::metricsT(Text) called directly!" << endl;
 #endif
 }
 
@@ -172,7 +156,7 @@ void MathInset::metricsT(TextMetricsInfo const &, Dimension &) const
 void MathInset::drawT(TextPainter &, int, int) const
 {
 #ifdef WITH_WARNINGS
-       lyxerr << "MathInset::drawT(Text) called directly!\n";
+       lyxerr << "MathInset::drawT(Text) called directly!" << endl;
 #endif
 }
 
@@ -226,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;
 }