X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_stringinset.h;h=bbbd670348893bdab95da87e4e4d0b26c0f48ac5;hb=edbef46cd7865dab72ab6b503d62e2492479d297;hp=874152ea792d6473f3c19fd1458b1e0488aaf9b7;hpb=bf2e2d58f3905625b65d51a6b258603e8071701c;p=lyx.git

diff --git a/src/mathed/math_stringinset.h b/src/mathed/math_stringinset.h
index 874152ea79..bbbd670348 100644
--- a/src/mathed/math_stringinset.h
+++ b/src/mathed/math_stringinset.h
@@ -1,43 +1,47 @@
 // -*- C++ -*-
+/**
+ * \file math_stringinset.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
 #ifndef MATH_STRINGINSET_H
 #define MATH_STRINGINSET_H
 
-#include "math_diminset.h"
+#include "math_inset.h"
 
-#ifdef __GNUG__
-#pragma interface
-#endif
 
 /** Some collection of chars with similar properties
- *  maily for math-extern
- *  \author André Pönitz
- *
- * Full author contact details are available in file CREDITS
+ *  mainly for math-extern
  */
 
-class MathStringInset : public MathDimInset {
+class MathStringInset : public MathInset {
 public:
 	///
-	explicit MathStringInset(string const & s);
+	explicit MathStringInset(std::string const & s);
 	///
-	MathInset * clone() const;
+	virtual std::auto_ptr<InsetBase> clone() const;
 	///
-	void metrics(MathMetricsInfo & mi) const;
+	void metrics(MetricsInfo & mi, Dimension & dim) const;
 	///
-	void draw(MathPainterInfo & pi, int x, int y) const;
+	void draw(PainterInfo & pi, int x, int y) const;
 	///
-	string str() const { return str_; }
+	std::string str() const { return str_; }
 	///
 	MathStringInset * asStringInset() { return this; }
 
 	///
 	void normalize(NormalStream &) const;
 	///
-	void octavize(OctaveStream &) const;
+	void octave(OctaveStream &) const;
 	///
-	void maplize(MapleStream &) const;
+	void maple(MapleStream &) const;
 	///
-	void mathematicize(MathematicaStream &) const;
+	void mathematica(MathematicaStream &) const;
 	///
 	void mathmlize(MathMLStream &) const;
 	///
@@ -45,6 +49,6 @@ public:
 
 private:
 	/// the string
-	string str_;
+	std::string str_;
 };
 #endif