prepare Qt 5.6 builds

[lyx.git] / src / FontList.h

diff --git a/src/FontList.h b/src/FontList.h
index 57d6d729508ea36d4d6cc48b59c0f4d799b8716e..9dfd5274269f1f6036d20f8b6c4ba588cef36b6e 100644 (file)
--- a/src/FontList.h
+++ b/src/FontList.h
@@ -56,12 +56,14 @@ 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 LaTeXFeatures;
+
 ///
 class FontList
 {
@@ -82,27 +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
-       Font_size highestInRange(
+       FontSize highestInRange(
                pos_type startpos,
                pos_type endpos,
-               Font_size def_size
+               FontSize def_size
                ) const;
 
+       ///
+       void validate(LaTeXFeatures & features) const;
+
 private:
        ///
        List list_;