cursor is no more damaging the background. L-shaped cursor is broken right now....

[lyx.git] / src / mathed / MathData.C

diff --git a/src/mathed/MathData.C b/src/mathed/MathData.C
index 1b995587b1ad37d2caf4f57b39b46a167f5f54b4..41cb2458b47b0f41ac221c3ddd3b7bb37c0a74da 100644 (file)
--- a/src/mathed/MathData.C
+++ b/src/mathed/MathData.C
@@ -15,7 +15,7 @@
 #include "InsetMathScript.h"
 #include "InsetMathMacro.h"
 #include "MathMacroTable.h"
-#include "MathMLStream.h"
+#include "MathStream.h"
 #include "MathSupport.h"
 #include "MathReplace.h"
 
@@ -29,7 +29,8 @@
 
 #include <boost/assert.hpp>
 
-using lyx::odocstream;
+
+namespace lyx {
 
 using std::abs;
 using std::endl;
@@ -39,10 +40,6 @@ using std::string;
 using std::vector;
 
 
-MathArray::MathArray()
-{}
-
-
 MathArray::MathArray(const_iterator from, const_iterator to)
        : base_type(from, to)
 {}
@@ -108,21 +105,21 @@ void MathArray::erase(size_type pos1, size_type pos2)
 
 void MathArray::dump2() const
 {
-       lyx::odocstringstream os;
+       odocstringstream os;
        NormalStream ns(os);
        for (const_iterator it = begin(); it != end(); ++it)
                ns << *it << ' ';
-       lyxerr << lyx::to_utf8(os.str());
+       lyxerr << to_utf8(os.str());
 }
 
 
 void MathArray::dump() const
 {
-       lyx::odocstringstream os;
+       odocstringstream os;
        NormalStream ns(os);
        for (const_iterator it = begin(); it != end(); ++it)
                ns << '<' << *it << '>';
-       lyxerr << lyx::to_utf8(os.str());
+       lyxerr << to_utf8(os.str());
 }
 
 
@@ -224,7 +221,7 @@ void MathArray::metrics(MetricsInfo & mi, Dimension & dim) const
 namespace {
 
 bool isInside(DocIterator const & it, MathArray const & ar,
-       lyx::pos_type p1, lyx::pos_type p2)
+       pos_type p1, pos_type p2)
 {
        for (size_t i = 0; i != it.depth(); ++i) {
                CursorSlice const & sl = it[i];
@@ -454,10 +451,10 @@ int MathArray::yo(BufferView & bv) const
 
 std::ostream & operator<<(std::ostream & os, MathArray const & ar)
 {
-       lyx::odocstringstream oss;
+       odocstringstream oss;
        NormalStream ns(oss);
        ns << ar;
-       return os << lyx::to_utf8(oss.str());
+       return os << to_utf8(oss.str());
 }
 
 
@@ -467,3 +464,6 @@ odocstream & operator<<(odocstream & os, MathArray const & ar)
        ns << ar;
        return os;
 }
+
+
+} // namespace lyx