Change to use preffered calling of Boost.Function

[lyx.git] / src / FontIterator.C

diff --git a/src/FontIterator.C b/src/FontIterator.C
index 9de58e3e3b72dbf323cb12120c5c7ee73d1bbb2d..e32886eace53d6fde2976cc5130c705b156ccc58 100644 (file)
--- a/src/FontIterator.C
+++ b/src/FontIterator.C
@@ -6,30 +6,30 @@
  * \author Alfredo Braunstein
  *
  * Full author contact details are available in file CREDITS.
- * 
+ *
  */
 
 
 #include <config.h>
 
-#include "lyxtext.h"
-
 #include "FontIterator.h"
+
+#include "lyxtext.h"
 #include "paragraph.h"
 
 
-FontIterator::FontIterator(LyXText const & text, ParagraphList::iterator pit,
+FontIterator::FontIterator(LyXText const & text, lyx::par_type pit,
                           lyx::pos_type pos)
        : text_(text), pit_(pit), pos_(pos),
-         font_(text.getFont(pit, pos)),
-         endspan_(pit->getEndPosOfFontSpan(pos)),
-         bodypos_(pit->beginOfBody())
+         font_(text.getFont(text.getPar(pit), pos)),
+         endspan_(text.getPar(pit).getEndPosOfFontSpan(pos)),
+         bodypos_(text.getPar(pit).beginOfBody())
 {}
 
 
 LyXFont FontIterator::operator*() const
 {
-       return font_;
+       return font_;
 }
 
 
@@ -43,8 +43,8 @@ FontIterator & FontIterator::operator++()
 {
        ++pos_;
        if (pos_ > endspan_ || pos_ == bodypos_) {
-               font_ = text_.getFont(pit_, pos_);
-               endspan_ = pit_->getEndPosOfFontSpan(pos_);
+               font_ = text_.getFont(text_.getPar(pit_), pos_);
+               endspan_ = text_.getPar(pit_).getEndPosOfFontSpan(pos_);
        }
        return *this;
 }