Ensure header files can be compiled stand-alone.

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

diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog
index 8cc5bb145ace6ba5c9b3762691e6b559d1128843..3090eb09c1e1b2cac2053476ce9b7b1463392655 100644 (file)
--- a/src/mathed/ChangeLog
+++ b/src/mathed/ChangeLog
@@ -1,3 +1,10 @@
+2003-09-05  Angus Leeming  <leeming@lyx.org>
+
+       * math_binaryopinset.[Ch]:
+       * math_gridinfo.h: 
+       * math_xyarrowinset.[Ch]: 
+       ensure that the header file can be compiled stand-alone.
+
 2003-09-05  Angus Leeming  <leeming@lyx.org>
 
        * *.C: strip out redundant #includes. (168 in total.)

diff --git a/src/mathed/math_binaryopinset.C b/src/mathed/math_binaryopinset.C
index 7d7586d0485579c3e5a74fe828cdee3c64ea0ab1..5b99d411a6229b1ace049cc50b098f51b0d4d3d2 100644 (file)
--- a/src/mathed/math_binaryopinset.C
+++ b/src/mathed/math_binaryopinset.C
@@ -26,9 +26,9 @@ MathBinaryOpInset::MathBinaryOpInset(char op)
 {}
 
 
-InsetBase * MathBinaryOpInset::clone() const
+auto_ptr<InsetBase> MathBinaryOpInset::clone() const
 {
-       return new MathBinaryOpInset(*this);
+       return auto_ptr<InsetBase>(new MathBinaryOpInset(*this));
 }
 
 

diff --git a/src/mathed/math_binaryopinset.h b/src/mathed/math_binaryopinset.h
index 538696e0ffa6ca7675196896e4e707454e5ec330..009766f6117386287235df481db46ba82fcd64e5 100644 (file)
--- a/src/mathed/math_binaryopinset.h
+++ b/src/mathed/math_binaryopinset.h
@@ -14,6 +14,7 @@
 
 #include "math_nestinset.h"
 #include "math_nestinset.h"
+#include "metricsinfo.h"
 
 
 /// An inset for multiplication
@@ -22,7 +23,7 @@ public:
        ///
        explicit MathBinaryOpInset(char op);
        ///
-       InsetBase * clone() const;
+       virtual std::auto_ptr<InsetBase> clone() const;
        ///
        void draw(PainterInfo &, int x, int y) const;
        ///

diff --git a/src/mathed/math_gridinfo.h b/src/mathed/math_gridinfo.h
index eed8590879636fb6ff58aabcfceeabf9aae1aa5a..9d50b531332cb24049b02ce209d3404fd3936227 100644 (file)
--- a/src/mathed/math_gridinfo.h
+++ b/src/mathed/math_gridinfo.h
@@ -12,6 +12,8 @@
 #ifndef MATH_GRIDINFO_H
 #define MATH_GRIDINFO_H
 
+#include "LString.h"
+
 struct ColInfo
 {
        ColInfo() : align('c'), rightline(0), leftline(false) {}

diff --git a/src/mathed/math_xyarrowinset.C b/src/mathed/math_xyarrowinset.C
index 26b569cd80b491c97ed44d35269f76a25d42ba2f..522d3e0d8c2e361ea7ef041b251f5b7c30dbbee9 100644 (file)
--- a/src/mathed/math_xyarrowinset.C
+++ b/src/mathed/math_xyarrowinset.C
@@ -27,9 +27,9 @@ MathXYArrowInset::MathXYArrowInset()
 {}
 
 
-InsetBase * MathXYArrowInset::clone() const
+auto_ptr<InsetBase> MathXYArrowInset::clone() const
 {
-       return new MathXYArrowInset(*this);
+       return auto_ptr<InsetBase>(new MathXYArrowInset(*this));
 }
 
 

diff --git a/src/mathed/math_xyarrowinset.h b/src/mathed/math_xyarrowinset.h
index 8b8e3a33a7ae0c9fa2a274485d71d3b868f6a52a..fe69939be4dc1875e382f2bfc14fe9cd492c1878 100644 (file)
--- a/src/mathed/math_xyarrowinset.h
+++ b/src/mathed/math_xyarrowinset.h
@@ -25,7 +25,7 @@ public:
        ///
        MathXYArrowInset();
        ///
-       InsetBase * clone() const;
+       virtual std::auto_ptr<InsetBase> clone() const;
        ///
        void metrics(MetricsInfo & mi) const;
        ///