From f0fee538c2862ea4eaefd9ca12ab7f80f98d076a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20P=C3=B6nitz?= Date: Wed, 14 Nov 2007 21:57:43 +0000 Subject: [PATCH] more strfwd git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21618 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/CoordCache.cpp | 4 +++- src/debug.h | 2 +- src/insets/InsetPagebreak.cpp | 2 ++ src/mathed/InsetMathExInt.cpp | 11 +++++------ 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/CoordCache.cpp b/src/CoordCache.cpp index 5be3a50f06..0974dc6c20 100644 --- a/src/CoordCache.cpp +++ b/src/CoordCache.cpp @@ -10,10 +10,12 @@ #include #include "CoordCache.h" -#include "debug.h" +#include "debug.h" #include "Text.h" +#include "support/docstring.h" + #include "insets/Inset.h" #include diff --git a/src/debug.h b/src/debug.h index 3648ec83d2..24be33ea32 100644 --- a/src/debug.h +++ b/src/debug.h @@ -19,7 +19,7 @@ #define LYXDEBUG_H #include "support/debugstream.h" -#include "support/docstring.h" +#include "support/strfwd.h" namespace lyx { diff --git a/src/insets/InsetPagebreak.cpp b/src/insets/InsetPagebreak.cpp index 3b1ea36e42..5e2f9d7b70 100644 --- a/src/insets/InsetPagebreak.cpp +++ b/src/insets/InsetPagebreak.cpp @@ -22,6 +22,8 @@ #include "frontends/FontMetrics.h" #include "frontends/Painter.h" +#include "support/docstring.h" + namespace lyx { diff --git a/src/mathed/InsetMathExInt.cpp b/src/mathed/InsetMathExInt.cpp index 543a3255a2..c0ac71e6f1 100644 --- a/src/mathed/InsetMathExInt.cpp +++ b/src/mathed/InsetMathExInt.cpp @@ -17,8 +17,7 @@ #include "InsetMathSymbol.h" #include "debug.h" -#include - +#include "support/docstring.h" namespace lyx { @@ -90,7 +89,7 @@ void InsetMathExInt::maple(MapleStream & os) const void InsetMathExInt::maxima(MaximaStream & os) const { - if ( symbol_ == "int" ) + if (symbol_ == "int") os << "integrate("; else os << symbol_ << '('; @@ -107,7 +106,7 @@ void InsetMathExInt::maxima(MaximaStream & os) const void InsetMathExInt::mathematica(MathematicaStream & os) const { - if ( symbol_ == "int" ) + if (symbol_ == "int") os << "Integrate["; else if (symbol_ == "sum") os << "Sum["; @@ -127,11 +126,11 @@ void InsetMathExInt::mathematica(MathematicaStream & os) const void InsetMathExInt::mathmlize(MathStream & os) const { - boost::scoped_ptr sym(new InsetMathSymbol(symbol_)); + InsetMathSymbol sym(symbol_); //if (hasScripts()) // mathmlize(sym, os); //else - sym->mathmlize(os); + sym.mathmlize(os); os << cell(0) << "" << MTag("mrow") << "" << cell(1) << ETag("mrow");