remove default constructor

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1655 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog
index 5f3e86a9e9385c43cb76e13cb31f5855707badea..93b9a92b723ef283064997af3538ad82b802707e 100644 (file)
--- a/src/mathed/ChangeLog
+++ b/src/mathed/ChangeLog
@@ -1,3 +1,11 @@
+2001-03-01  Lars Gullik Bjønnes  <larsbj@trylle.birdstep.com>
+
+       * math_macroarg.h: remove default constructor
+
+       * math_macroarg.C: include Lsstream.h instead of debug.h
+       (MathMacroArgument): remove default constructor
+       (Write): add std:: on ostream arg
+
 2001-02-23  John Levon  <moz@compsoc.man.ac.uk>
 
        * math_parser.C:

diff --git a/src/mathed/math_macroarg.C b/src/mathed/math_macroarg.C
index b8d4c8b927da19bb485a71c2d5ad86364b7dd91e..58d43134c9c7eb511c4f1e3f0212ce0bcb5fb822 100644 (file)
--- a/src/mathed/math_macroarg.C
+++ b/src/mathed/math_macroarg.C
@@ -6,21 +6,13 @@
 
 #include "math_macroarg.h"
 #include "mathed/support.h"
-#include "debug.h"
-
-
-MathMacroArgument::MathMacroArgument()
-       : expnd_mode_(false), number_(1)
-{
-       SetType(LM_OT_MACRO_ARG);
-}
+#include "Lsstream.h"
 
 
 MathMacroArgument::MathMacroArgument(int n)
-       : expnd_mode_(false), number_(n)
-{
-       SetType(LM_OT_MACRO_ARG);
-}
+       : MathParInset(LM_ST_TEXT, "", LM_OT_MACRO_ARG),
+         expnd_mode_(false), number_(n)
+{}
 
 
 MathedInset * MathMacroArgument::Clone()
@@ -59,14 +51,15 @@ void MathMacroArgument::Metrics()
        } else {
                std::ostringstream ost;
                ost << '#' << number_;
-               width = mathed_string_width(LM_TC_TEX, size(), ost.str().c_str());
+               width = mathed_string_width(LM_TC_TEX, size(),
+                                           ost.str().c_str());
                mathed_string_height(LM_TC_TEX, size(), ost.str().c_str(),
                                     ascent, descent);
        }
 }
 
 
-void MathMacroArgument::Write(ostream & os, bool fragile)
+void MathMacroArgument::Write(std::ostream & os, bool fragile)
 {
        if (expnd_mode_) {
                MathParInset::Write(os, fragile);

diff --git a/src/mathed/math_macroarg.h b/src/mathed/math_macroarg.h
index b12e9e85035f068d4b183a379db2971e1d476527..a8eb021aa400df25098295e3442a4ee7be9819de 100644 (file)
--- a/src/mathed/math_macroarg.h
+++ b/src/mathed/math_macroarg.h
@@ -13,8 +13,6 @@
 */
 class MathMacroArgument : public MathParInset {
 public:
-       ///
-       MathMacroArgument();
        ///
        explicit
        MathMacroArgument(int);