X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetFormulaMacro.cpp;h=6e5b65a7ec217b157a1748b877a8a5439483ad08;hb=d0d7d0103aed0b300807be54224ba7cd324c1ff5;hp=91195646f1b35bbf4749b832f68249369e374a48;hpb=5008ee540f84715cd10e87f3fa0cd5dc7b974784;p=lyx.git

diff --git a/src/mathed/InsetFormulaMacro.cpp b/src/mathed/InsetFormulaMacro.cpp
index 91195646f1..6e5b65a7ec 100644
--- a/src/mathed/InsetFormulaMacro.cpp
+++ b/src/mathed/InsetFormulaMacro.cpp
@@ -12,7 +12,7 @@
 #include <config.h>
 
 #include "InsetFormulaMacro.h"
-#include "MathMacroTable.h"
+#include "MacroTable.h"
 #include "MathMacroTemplate.h"
 
 #include "BufferView.h"
@@ -30,17 +30,14 @@
 
 #include <sstream>
 
-
-namespace lyx {
-
-using odocstream;
-using support::bformat;
-
 using std::string;
 using std::auto_ptr;
 using std::ostream;
 using std::endl;
 
+namespace lyx {
+
+using support::bformat;
 
 
 InsetFormulaMacro::InsetFormulaMacro()
@@ -49,7 +46,7 @@ InsetFormulaMacro::InsetFormulaMacro()
 
 
 InsetFormulaMacro::InsetFormulaMacro
-		(string const & name, int nargs, string const & type)
+		(docstring const & name, int nargs, docstring const & type)
 	: InsetMathNest(2), name_(name)
 {
 	MathMacroTable::create(MathAtom(new MathMacroTemplate(name, nargs, type)));
@@ -64,9 +61,9 @@ InsetFormulaMacro::InsetFormulaMacro(string const & s)
 }
 
 
-auto_ptr<InsetBase> InsetFormulaMacro::clone() const
+auto_ptr<Inset> InsetFormulaMacro::clone() const
 {
-	return auto_ptr<InsetBase>(new InsetFormulaMacro(*this));
+	return auto_ptr<Inset>(new InsetFormulaMacro(*this));
 }
 
 
@@ -79,7 +76,7 @@ void InsetFormulaMacro::write(Buffer const &, ostream & os) const
 
 
 int InsetFormulaMacro::latex(Buffer const &, odocstream & os,
-                             OutputParams const & runparams) const
+			     OutputParams const & runparams) const
 {
 	//lyxerr << "InsetFormulaMacro::latex" << endl;
 	WriteStream wi(os, runparams.moving_arg, true);
@@ -89,7 +86,7 @@ int InsetFormulaMacro::latex(Buffer const &, odocstream & os,
 
 
 int InsetFormulaMacro::plaintext(Buffer const &, odocstream & os,
-                                 OutputParams const &) const
+				 OutputParams const &) const
 {
 	odocstringstream oss;
 	WriteStream wi(oss, false, true);
@@ -102,7 +99,7 @@ int InsetFormulaMacro::plaintext(Buffer const &, odocstream & os,
 
 
 int InsetFormulaMacro::docbook(Buffer const & buf, ostream & os,
-                               OutputParams const & runparams) const
+			       OutputParams const & runparams) const
 {
 	return plaintext(buf, os, runparams);
 }
@@ -144,7 +141,7 @@ bool InsetFormulaMacro::metrics(MetricsInfo & mi, Dimension & dim) const
 void InsetFormulaMacro::draw(PainterInfo & p, int x, int y) const
 {
 	// label
-	LyXFont font = p.base.font;
+	Font font = p.base.font;
 	font.setColor(Color::math);
 
 	PainterInfo pi(p.base.bv, p.pain);