Rename insets/insetxxx to insets/InsetXxx, part 1

[lyx.git] / src / pariterator.C

diff --git a/src/pariterator.C b/src/pariterator.C
index c4d027f540c742f2b9c0471b08d10750d1f0245d..ee5e07fd998c625df0a19dd211a0f711cc8b77dd 100644 (file)
--- a/src/pariterator.C
+++ b/src/pariterator.C
@@ -12,14 +12,13 @@
 
 #include "pariterator.h"
 
-#include "ParagraphList_fwd.h"
 #include "paragraph.h"
 #include "lyxtext.h"
 
-#include "insets/inset.h"
+#include "insets/Inset.h"
 
-using lyx::par_type;
 
+namespace lyx {
 
 ///
 /// ParIterator
@@ -78,31 +77,31 @@ ParIterator & ParIterator::operator--()
 
 Paragraph & ParIterator::operator*() const
 {
-       return text()->getPar(par());
+       return const_cast<Paragraph&>(text()->getPar(pit()));
 }
 
 
-par_type ParIterator::pit() const
+pit_type ParIterator::pit() const
 {
-       return par();
+       return DocIterator::pit();
 }
 
 
 Paragraph * ParIterator::operator->() const
 {
-       return &text()->getPar(par());
+       return const_cast<Paragraph*>(&text()->getPar(pit()));
 }
 
 
-par_type ParIterator::outerPar() const
+pit_type ParIterator::outerPar() const
 {
-       return bottom().par();
+       return bottom().pit();
 }
 
 
 ParagraphList & ParIterator::plist() const
 {
-       return text()->paragraphs();
+       return const_cast<ParagraphList&>(text()->paragraphs());
 }
 
 
@@ -118,7 +117,7 @@ bool operator!=(ParIterator const & iter1, ParIterator const & iter2)
 }
 
 
-DocIterator makeDocIterator(ParIterator const & par, lyx::pos_type pos)
+DocIterator makeDocIterator(ParIterator const & par, pos_type pos)
 {
        DocIterator dit(par);
        dit.pos() = pos;
@@ -151,13 +150,13 @@ ParConstIterator & ParConstIterator::operator++()
 
 Paragraph const & ParConstIterator::operator*() const
 {
-       return text()->getPar(par());
+       return text()->getPar(pit());
 }
 
 
 Paragraph const * ParConstIterator::operator->() const
 {
-       return &text()->getPar(par());
+       return &text()->getPar(pit());
 }
 
 
@@ -193,3 +192,6 @@ ParConstIterator par_const_iterator_end(InsetBase const & inset)
 {
        return ParConstIterator(doc_iterator_end(const_cast<InsetBase &>(inset)));
 }
+
+
+} // namespace lyx