Replace LString.h with support/std_string.h,

[features.git] / src / mathed / formulabase.C

diff --git a/src/mathed/formulabase.C b/src/mathed/formulabase.C
index b2dec5dbdf28354f62db5e2373dbd67cbaf51e58..c50427587aff15045308bfaa425a397065a12262 100644 (file)
--- a/src/mathed/formulabase.C
+++ b/src/mathed/formulabase.C
@@ -1,57 +1,41 @@
-/*
-*  File:        formulabase.C
-*  Purpose:     Implementation of common parts of the LyX  math insets
-*  Author:      Alejandro Aguilar Sierra <asierra@servidor.unam.mx>
-*  Created:     January 1996
-*
-*  Copyright: 1996-1998 Alejandro Aguilar Sierra
-*
-*  Version: 0.4, Lyx project.
-*
-*   You are free to use and modify this code under the terms of
-*   the GNU General Public Licence version 2 or later.
-*/
+/**
+ * \file formulabase.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Alejandro Aguilar Sierra
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
 #include <config.h>
 
-#include "Lsstream.h"
+#include "formulabase.h"
+#include "support/std_sstream.h"
 #include "support/LAssert.h"
 #include "formula.h"
 #include "formulamacro.h"
-#include "lyxrc.h"
 #include "funcrequest.h"
 #include "BufferView.h"
 #include "lyxtext.h"
 #include "gettext.h"
-#include "LaTeXFeatures.h"
 #include "debug.h"
 #include "math_support.h"
-#include "metricsinfo.h"
-#include "math_data.h"
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
 #include "frontends/LyXView.h"
-#include "frontends/font_metrics.h"
-#include "frontends/mouse_state.h"
 #include "math_arrayinset.h"
-#include "math_charinset.h"
 #include "math_deliminset.h"
 #include "math_cursor.h"
 #include "math_factory.h"
-#include "math_fontinset.h"
 #include "math_hullinset.h"
-#include "math_iterator.h"
-#include "math_macrotable.h"
 #include "math_parser.h"
-#include "math_pos.h"
 #include "math_spaceinset.h"
 #include "undo_funcs.h"
-#include "textpainter.h"
 #include "frontends/Dialogs.h"
-#include "intl.h"
 #include "ref_inset.h"
 
-#include <fstream>
 
 using namespace lyx::support;
 
@@ -86,14 +70,14 @@ bool openNewInset(BufferView * bv, UpdatableInset * new_inset)
 
 
 InsetFormulaBase::InsetFormulaBase()
-       : xo_(0), yo_(0)
+       : view_(0), xo_(0), yo_(0)
 {
        // This is needed as long the math parser is not re-entrant
        initMath();
-       //lyxerr << "sizeof MathInset: " << sizeof(MathInset) << "\n";
-       //lyxerr << "sizeof MetricsInfo: " << sizeof(MetricsInfo) << "\n";
-       //lyxerr << "sizeof MathCharInset: " << sizeof(MathCharInset) << "\n";
-       //lyxerr << "sizeof LyXFont: " << sizeof(LyXFont) << "\n";
+       //lyxerr << "sizeof MathInset: " << sizeof(MathInset) << endl;
+       //lyxerr << "sizeof MetricsInfo: " << sizeof(MetricsInfo) << endl;
+       //lyxerr << "sizeof MathCharInset: " << sizeof(MathCharInset) << endl;
+       //lyxerr << "sizeof LyXFont: " << sizeof(LyXFont) << endl;
 }
 
 
@@ -331,9 +315,9 @@ dispatch_result InsetFormulaBase::localDispatch(FuncRequest const & cmd)
 
        switch (cmd.action) {
                case LFUN_INSET_EDIT:
-                       lyxerr << "Called EDIT with '" << cmd.argument << "'\n";
+                       lyxerr << "Called EDIT with '" << cmd.argument << "'" << endl;
                        if (!bv->lockInset(this))
-                               lyxerr << "Cannot lock math inset in edit call!\n";
+                               lyxerr << "Cannot lock math inset in edit call!" << endl;
                        releaseMathCursor(bv);
                        if (!cmd.argument.empty()) {
                                mathcursor = new MathCursor(this, cmd.argument == "left");
@@ -349,16 +333,16 @@ dispatch_result InsetFormulaBase::localDispatch(FuncRequest const & cmd)
                        return DISPATCHED;
 
                case LFUN_MOUSE_PRESS:
-                       //lyxerr << "Mouse single press\n";
+                       //lyxerr << "Mouse single press" << endl;
                        return lfunMousePress(cmd);
                case LFUN_MOUSE_MOTION:
-                       //lyxerr << "Mouse motion\n";
+                       //lyxerr << "Mouse motion" << endl;
                        return lfunMouseMotion(cmd);
                case LFUN_MOUSE_RELEASE:
-                       //lyxerr << "Mouse single release\n";
+                       //lyxerr << "Mouse single release" << endl;
                        return lfunMouseRelease(cmd);
                case LFUN_MOUSE_DOUBLE:
-                       //lyxerr << "Mouse double\n";
+                       //lyxerr << "Mouse double" << endl;
                        return localDispatch(FuncRequest(LFUN_WORDSEL));
                default:
                        break;
@@ -398,7 +382,7 @@ dispatch_result InsetFormulaBase::localDispatch(FuncRequest const & cmd)
                sel = true; // fall through...
        case LFUN_RIGHT:
                result = mathcursor->right(sel) ? DISPATCHED : FINISHED_RIGHT;
-               //lyxerr << "calling scroll 20\n";
+               //lyxerr << "calling scroll 20" << endl;
                //scroll(bv, 20);
                // write something to the minibuffer
                //bv->owner()->message(mathcursor->info());
@@ -495,7 +479,7 @@ dispatch_result InsetFormulaBase::localDispatch(FuncRequest const & cmd)
        //      dispatch_result = dispatch_buffer;
        //      break;
        case LFUN_SETXY: {
-               lyxerr << "LFUN_SETXY broken!\n";
+               lyxerr << "LFUN_SETXY broken!" << endl;
                int x = 0;
                int y = 0;
                istringstream is(cmd.argument.c_str());
@@ -607,7 +591,7 @@ dispatch_result InsetFormulaBase::localDispatch(FuncRequest const & cmd)
 
        case LFUN_MATH_DELIM:
        {
-               //lyxerr << "formulabase::LFUN_MATH_DELIM, arg: '" << arg << "'\n";
+               //lyxerr << "formulabase::LFUN_MATH_DELIM, arg: '" << arg << "'" << endl;
                string ls;
                string rs = split(cmd.argument, ls, ' ');
                // Reasonable default values
@@ -829,7 +813,7 @@ bool InsetFormulaBase::searchForward(BufferView * bv, string const & str,
        static string laststr;
 
        if (lastformula != this || laststr != str) {
-               //lyxerr << "reset lastformula to " << this << "\n";
+               //lyxerr << "reset lastformula to " << this << endl;
                lastformula = this;
                laststr = str;
                current = ibegin(par().nucleus());
@@ -858,7 +842,7 @@ bool InsetFormulaBase::searchForward(BufferView * bv, string const & str,
                }
        }
 
-       //lyxerr << "not found!\n";
+       //lyxerr << "not found!" << endl;
        lastformula = 0;
        return false;
 }
@@ -867,7 +851,7 @@ bool InsetFormulaBase::searchForward(BufferView * bv, string const & str,
 bool InsetFormulaBase::searchBackward(BufferView * bv, string const & what,
                                      bool a, bool b)
 {
-       lyxerr[Debug::MATHED] << "searching backward not implemented in mathed\n";
+       lyxerr[Debug::MATHED] << "searching backward not implemented in mathed" << endl;
        return searchForward(bv, what, a, b);
 }
 
@@ -895,7 +879,7 @@ void mathDispatchCreation(FuncRequest const & cmd, bool display)
        //      sel = "";
        //else
 
-       string sel = bv->getLyXText()->selectionAsString(bv->buffer(), false);
+       string sel = bv->getLyXText()->selectionAsString(*bv->buffer(), false);
 
        if (sel.empty()) {
                InsetFormula * f = new InsetFormula(bv);