build libiconv with cmake

[lyx.git] / src / FontList.cpp

diff --git a/src/FontList.cpp b/src/FontList.cpp
index afa7894ce9639067ad02a4dd3a51f4d570f42040..e5a86dbb29249b9fe81d2306d47f9bf5137098a8 100644 (file)
--- a/src/FontList.cpp
+++ b/src/FontList.cpp
@@ -20,9 +20,7 @@
 
 #include "FontList.h"
 
-#include <boost/next_prior.hpp>
-
-#include <algorithm>
+#include "support/lyxalgo.h"
 
 using namespace std;
 
@@ -53,13 +51,14 @@ FontList::const_iterator FontList::fontIterator(pos_type pos) const
 }
 
 
-Font & FontList::get(pos_type pos)
+Font const & FontList::get(pos_type pos)
 {
        iterator end = list_.end();
        iterator it = fontIterator(pos);
        if (it != end && it->pos() == pos)
                return it->font_;
-       static Font dummy;
+
+       static Font const dummy;
        return dummy;
 }
 
@@ -71,7 +70,7 @@ void FontList::erase(pos_type pos)
        iterator beg = list_.begin();
        if (it != list_.end() && it->pos() == pos
                && (pos == 0 
-                       || (it != list_.begin() && boost::prior(it)->pos() == pos - 1))) {
+                       || (it != list_.begin() && prev(it, 1)->pos() == pos - 1))) {
 
                // If it is a multi-character font
                // entry, we just make it smaller
@@ -143,7 +142,7 @@ void FontList::set(pos_type pos, Font const & font)
        bool const end = found && list_[i].pos() == pos;
 
        if (!begin && !end) {
-               // The general case: The block is splitted into 3 blocks
+               // The general case: The block is split into 3 blocks
                list_.insert(list_.begin() + i,
                                FontTable(pos - 1, list_[i].font()));
                list_.insert(list_.begin() + i + 1,
@@ -206,13 +205,6 @@ FontSize FontList::highestInRange(pos_type startpos, pos_type endpos,
 }
 
 
-bool FontList::hasChangeInRange(pos_type pos, int len) const
-{
-       List::const_iterator cit = fontIterator(pos);
-       return cit == list_.end() || pos + len - 1 <= cit->pos();
-}
-
-
 void FontList::validate(LaTeXFeatures & features) const
 {
        const_iterator fcit = list_.begin();