Georg Baum's vspace change

[lyx.git] / src / mathed / math_macro.h

diff --git a/src/mathed/math_macro.h b/src/mathed/math_macro.h
index 5f356d861a31f8c2d2894ee10ffdd45a80cc1616..6047c3811d2b8e74d02cdda34b3fb990bb1b4dbb 100644 (file)
--- a/src/mathed/math_macro.h
+++ b/src/mathed/math_macro.h
@@ -13,11 +13,10 @@
 #ifndef MATH_MACRO_H
 #define MATH_MACRO_H
 
-
+#include "math_data.h"
 #include "math_nestinset.h"
 #include "metricsinfo.h"
-#include "math_macroarg.h"
-#include "support/std_string.h"
+
 
 class MathMacroTemplate;
 
@@ -26,7 +25,7 @@ class MathMacroTemplate;
 class MathMacro : public MathNestInset {
 public:
        /// A macro can be built from an existing template
-       explicit MathMacro(string const &);
+       explicit MathMacro(std::string const &);
        ///
        MathMacro(MathMacro const &);
        ///
@@ -67,7 +66,7 @@ private:
        ///
        void operator=(MathMacro const &);
        ///
-       string name() const;
+       std::string name() const;
        ///
        bool defining() const;
        ///