From: Lars Gullik Bjønnes <larsbj@gullik.org>
Date: Thu, 1 Mar 2001 16:49:31 +0000 (+0000)
Subject: remove default constructor
X-Git-Tag: 1.6.10~21536
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=0452a89961fb7a56fc8fce9a23ddff93e59e011d;p=lyx.git

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 5f3e86a9e9..93b9a92b72 100644
--- 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 b8d4c8b927..58d43134c9 100644
--- 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 b12e9e8503..a8eb021aa4 100644
--- 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);