* Painter.h:

[lyx.git] / src / dociterator.C

diff --git a/src/dociterator.C b/src/dociterator.C
index 25b9a282e6969e44ef1791dbd130e6c89b25c5af..47e7526e5e00d0af03eaa4357c73f84ac0bd3f4d 100644 (file)
--- a/src/dociterator.C
+++ b/src/dociterator.C
@@ -18,13 +18,17 @@
 #include "lyxrow.h"
 #include "paragraph.h"
 
-#include "mathed/math_data.h"
-#include "mathed/math_inset.h"
+#include "mathed/MathData.h"
+#include "mathed/InsetMath.h"
+
 #include "insets/insettabular.h"
 
 #include <boost/assert.hpp>
 #include <boost/current_function.hpp>
 
+
+namespace lyx {
+
 using std::endl;
 
 
@@ -180,13 +184,13 @@ Row const & DocIterator::textRow() const
 }
 
 
-DocIterator::pit_type DocIterator::lastpit() const
+pit_type DocIterator::lastpit() const
 {
        return inMathed() ? 0 : text()->paragraphs().size() - 1;
 }
 
 
-DocIterator::pos_type DocIterator::lastpos() const
+pos_type DocIterator::lastpos() const
 {
        return inMathed() ? cell().size() : paragraph().size();
 }
@@ -298,9 +302,9 @@ void DocIterator::forwardPos(bool ignorecollapsed)
        }
 
        // jump over collapsables if they are collapsed
-       // FIXME: the check for asMathInset() shouldn't be necessary
+       // FIXME: the check for asInsetMath() shouldn't be necessary
        // but math insets do not return a sensible editable() state yet.
-       if (ignorecollapsed && nextInset() && (!nextInset()->asMathInset()
+       if (ignorecollapsed && nextInset() && (!nextInset()->asInsetMath()
            && nextInset()->editable() != InsetBase::HIGHLY_EDITABLE)) {
                ++top().pos();
                return;
@@ -591,3 +595,6 @@ bool operator==(StableDocIterator const & dit1, StableDocIterator const & dit2)
 {
        return dit1.data_ == dit2.data_;
 }
+
+
+} // namespace lyx