X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_inset.h;h=1b374a866d7b25c2c94939a5936d0d52ec2065d8;hb=45a03f4f67bb00f8142e465c615f348f0622eb32;hp=6f969acf76fcf649da8a5402dc6d7a3e538c7fef;hpb=c10a9001c85d63952f10b53978c265b4c29a237f;p=lyx.git

diff --git a/src/mathed/math_inset.h b/src/mathed/math_inset.h
index 6f969acf76..1b374a866d 100644
--- a/src/mathed/math_inset.h
+++ b/src/mathed/math_inset.h
@@ -37,7 +37,7 @@ class MathFuncInset: public MathedInset  {
 public:
 	///
 	explicit
-	MathFuncInset(char const * nm,
+	MathFuncInset(string const & nm,
 		      short ot = LM_OT_FUNC, short st = LM_ST_TEXT);
 	///
 	~MathFuncInset();
@@ -46,7 +46,7 @@ public:
 	///
 	void draw(Painter &, int, int);
 	///
-	void Write(std::ostream &, signed char fragile);
+	void Write(std::ostream &, bool fragile);
 	///
 	void Metrics();
 	///
@@ -57,7 +57,7 @@ protected:
 	///
 	bool lims;
 	///
-	char * fname;
+	string fname;
 };
 
 
@@ -75,7 +75,7 @@ public:
 	///
 	void draw(Painter &, int, int);
 	///
-	void Write(std::ostream &, signed char fragile);
+	void Write(std::ostream &, bool fragile);
 	///
 	void Metrics();
 	///
@@ -99,13 +99,13 @@ protected:
 class MathDotsInset: public MathedInset {
 public:
 	///
-	MathDotsInset(char const *, int, short st = LM_ST_TEXT);
+	MathDotsInset(string const &, int, short st = LM_ST_TEXT);
 	///
 	MathedInset * Clone();
 	///
 	void draw(Painter &, int, int);
 	///
-	void Write(std::ostream &, signed char fragile);
+	void Write(std::ostream &, bool fragile);
 	///
 	void Metrics();
 protected:
@@ -124,7 +124,7 @@ public:
 	///
 	void draw(Painter &, int, int);
 	///
-	void Write(std::ostream &, signed char fragile);
+	void Write(std::ostream &, bool fragile);
 	///
 	inline void Metrics();
 	///
@@ -141,13 +141,13 @@ protected:
 class MathBigopInset: public MathedInset {
 public:
 	///
-	MathBigopInset(char const *, int, short st = LM_ST_TEXT);
+	MathBigopInset(string const &, int, short st = LM_ST_TEXT);
 	///
 	MathedInset * Clone();
 	///
 	void draw(Painter &, int, int);
 	///
-	void Write(std::ostream &, signed char fragile);
+	void Write(std::ostream &, bool fragile);
 	///
 	void Metrics();
 	///
@@ -174,7 +174,7 @@ public:
 	///
 	void draw(Painter &, int x, int baseline);
 	///
-	void Write(std::ostream &, signed char fragile);
+	void Write(std::ostream &, bool fragile);
 	///
 	void Metrics();
 	///
@@ -197,7 +197,7 @@ public:
 	///
 	void draw(Painter &, int x, int baseline);
 	///
-	void Write(std::ostream &, signed char fragile);
+	void Write(std::ostream &, bool fragile);
 	///
 	void Metrics();
 	
@@ -243,7 +243,7 @@ public:
 	///
 	void draw(Painter &, int, int);
 	///
-	void Write(std::ostream &, signed char fragile);
+	void Write(std::ostream &, bool fragile);
 	///
 	void Metrics();
 protected:
@@ -264,7 +264,7 @@ public:
 	///
 	void draw(Painter &, int, int);
 	///
-	void Write(std::ostream &, signed char fragile);
+	void Write(std::ostream &, bool fragile);
 	///
 	void Metrics();
 	///
@@ -284,9 +284,7 @@ protected:
  
 inline
 MathFuncInset::~MathFuncInset()
-{
-    if (fname && GetType() == LM_OT_UNDEF) delete[] fname;
-}
+{}
 
 
 inline
@@ -297,7 +295,7 @@ bool MathFuncInset::GetLimits() const
 
 
 inline
-void MathFuncInset::Write(std::ostream & os, signed char /* fragile */)
+void MathFuncInset::Write(std::ostream & os, bool /* fragile */)
 {
 	os << "\\" << name << ' ';
 }