prepare Qt 5.6 builds

[lyx.git] / src / FontList.h

diff --git a/src/FontList.h b/src/FontList.h
index 86824bb55da5afaa56ccca16a1cd93a05a1ec1c2..9dfd5274269f1f6036d20f8b6c4ba588cef36b6e 100644 (file)
--- a/src/FontList.h
+++ b/src/FontList.h
@@ -56,21 +56,13 @@ private:
        paragraph or, in the case of nested paragraphs, from the
        layout in the environment one level up until completely
        resolved.
-       The values Font::IGNORE_* and Font::TOGGLE are NOT
+       The values Font::IGNORE_* and FONT_TOGGLE are NOT
        allowed in these font tables.
        */
        Font font_;
 };
 
-
-class matchFT
-{
-public:
-       /// used by lower_bound and upper_bound
-       int operator()(FontTable const & a, FontTable const & b) const {
-               return a.pos() < b.pos();
-       }
-};
+class LaTeXFeatures;
 
 ///
 class FontList
@@ -92,20 +84,37 @@ public:
        ///
        bool empty() const { return list_.empty(); }
        ///
+       void clear() { list_.clear(); }
+       ///
        void erase(pos_type pos);
        ///
        iterator fontIterator(pos_type pos);
        ///
        const_iterator fontIterator(pos_type pos) const;
        ///
-       Font & get(pos_type pos);
+       Font const & get(pos_type pos);
        ///
        void set(pos_type pos, Font const & font);
        ///
+       void setRange(
+               pos_type startpos,
+               pos_type endpos,
+               Font const & font);
+       ///
        void increasePosAfterPos(pos_type pos);
        ///
        void decreasePosAfterPos(pos_type pos);
 
+       /// Returns the height of the highest font in range
+       FontSize highestInRange(
+               pos_type startpos,
+               pos_type endpos,
+               FontSize def_size
+               ) const;
+
+       ///
+       void validate(LaTeXFeatures & features) const;
+
 private:
        ///
        List list_;