small cleanup, doxygen, formatting changes

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

diff --git a/src/mathed/math_macro.h b/src/mathed/math_macro.h
index f63466cd0b53808e374da0e1c47619eec1fd5b50..f44ac9de5a132f85e9f7c275eb1eda116d02fdf5 100644 (file)
--- a/src/mathed/math_macro.h
+++ b/src/mathed/math_macro.h
@@ -22,14 +22,15 @@
 #endif
 
 #include <vector>
-
 #include "math_parinset.h"
-#include "debug.h"
 
 class MathMacroTemplate;
 
 
-/// This class contains the data for a macro
+/** This class contains the data for a macro
+    \author Alejandro Aguilar Sierra <asierra@servidor.unam.mx>
+    \version November 1996
+ */
 class MathMacro : public MathParInset
 {
 public:
@@ -66,40 +67,35 @@ public:
        ///
        MathedRowSt * getRowSt() const;
        ///
-       void SetData(MathedArray *);
+       void setData(MathedArray *);
        ///
        MathedTextCodes getTCode() const;
        ///
        bool Permit(short) const;
-    
 private:
        ///
-       MathMacroTemplate * tmplate;
+       MathMacroTemplate * tmplate_;
        ///
        struct MacroArgumentBase {
                /// Position of the macro
-               int x, y;
+               int x;
+               ///
+               int y;
                ///
                MathedRowSt * row;
                ///
                MathedArray * array;
                ///
-               MacroArgumentBase() { x = y = 0;  array = 0; row = 0; }
+               MacroArgumentBase()
+                       : x(0), y(0), row(0), array(0)
+                       {}
        };
        std::vector<MacroArgumentBase> args_;
        ///
-       int idx;
+       int idx_;
        ///
-       int nargs;
+       int nargs_;
        ///
-       MathedTextCodes tcode;
-       ///
-       friend class MathMacroTemplate;
+       MathedTextCodes tcode_;
 };
-
-///
-//typedef MathMacro * MathMacroP;
-///
-//typedef MathMacroTemplate * MathMacroTemplateP;
-
 #endif