merge LyXTabular.{cpp,h} and insets/InsetTabular.{cpp,h}. More reorganization necessa...

[lyx.git] / src / FontIterator.h

diff --git a/src/FontIterator.h b/src/FontIterator.h
index 99d82432f6cc55cdf20b0a508356199cdc19c7c3..96277ffcd21553b22d1b6d302b0efe2cbb56687a 100644 (file)
--- a/src/FontIterator.h
+++ b/src/FontIterator.h
@@ -20,38 +20,49 @@
 #ifndef FONTITERATOR_H
 #define FONTITERATOR_H
 
-#include "lyxfont.h"
+#include "LyXFont.h"
 
 #include "support/types.h"
 
+
+namespace lyx {
+
+class Buffer;
 class LyXText;
+class Paragraph;
 
 
 class FontIterator : std::iterator<std::forward_iterator_tag, LyXFont>
 {
 public:
        ///
-       FontIterator(LyXText const & text, lyx::pit_type pit, lyx::pos_type pos);
+       FontIterator(Buffer const & buffer, LyXText const & text,
+               Paragraph const & par, pos_type pos);
        ///
-       LyXFont operator*() const;
+       LyXFont const & operator*() const;
        ///
        FontIterator & operator++();
        ///
        LyXFont * operator->();
 
 private:
+       ///
+       Buffer const & buffer_;
        ///
        LyXText const & text_;
        ///
-       lyx::pit_type pit_;
+       Paragraph const & par_;
        ///
-       lyx::pos_type pos_;
+       pos_type pos_;
        ///
        LyXFont font_;
        ///
-       lyx::pos_type endspan_;
+       pos_type endspan_;
        ///
-       lyx::pos_type bodypos_;
+       pos_type bodypos_;
 };
 
+
+} // namespace lyx
+
 #endif // FONTITERATOR_H