]> git.lyx.org Git - lyx.git/blobdiff - src/DocIterator.cpp
* gcc does not like missing characters in keywords
[lyx.git] / src / DocIterator.cpp
index af36b644573fdbbf3fd0151cac61f5d0eec0c3bd..7b7a59d2014d0d4fc86c1e776c5069d86314f355 100644 (file)
@@ -15,8 +15,9 @@
 #include "DocIterator.h"
 
 #include "debug.h"
-#include "Text.h"
+#include "InsetList.h"
 #include "Paragraph.h"
+#include "Text.h"
 
 #include "mathed/MathData.h"
 #include "mathed/InsetMath.h"
@@ -78,7 +79,7 @@ Inset * DocIterator::prevInset() const
        BOOST_ASSERT(!empty());
        if (pos() == 0)
                return 0;
-       if (inMathed())
+       if (inMathed()) {
                if (cell().empty())
                        // FIXME: this should not happen but it does.
                        // See bug 3189
@@ -86,6 +87,7 @@ Inset * DocIterator::prevInset() const
                        return 0;
                else
                        return prevAtom().nucleus();
+       }
        return paragraph().isInset(pos() - 1) ? paragraph().getInset(pos() - 1) : 0;
 }
 
@@ -94,7 +96,7 @@ Inset * DocIterator::realInset() const
 {
        BOOST_ASSERT(inTexted());
        // if we are in a tabular, we need the cell
-       if (inset().lyxCode() == Inset::TABULAR_CODE) {
+       if (inset().lyxCode() == TABULAR_CODE) {
                InsetTabular & tabular = static_cast<InsetTabular&>(inset());
                return tabular.cell(idx()).get();
        }
@@ -302,7 +304,7 @@ void DocIterator::forwardPar()
                        pos_type const lastp = lastpos();
                        Paragraph const & par = paragraph();
                        pos_type & pos = top().pos();
-                       if (par.insetlist.empty())
+                       if (par.insetList().empty())
                                pos = lastp;
                        else
                                while (pos < lastp && !par.isInset(pos))