ws changes mostly

[lyx.git] / src / bufferview_funcs.C

diff --git a/src/bufferview_funcs.C b/src/bufferview_funcs.C
index c7c413fecf289233ca9847297ed89cb1b6f48efe..e83ce1ae85ae08074e1c7eaf534c43eb0a03c7c2 100644 (file)
--- a/src/bufferview_funcs.C
+++ b/src/bufferview_funcs.C
@@ -35,7 +35,7 @@
 
 #include "insets/insettext.h"
 
-#include "support/tostr.h"
+#include "support/convert.h"
 
 #include <sstream>
 
@@ -50,7 +50,7 @@ namespace bv_funcs {
 
 // Set data using font and toggle
 // If successful, returns true
-bool font2string(LyXFont const & font, bool toggle, string & data)
+bool font2string(LyXFont const & font, bool const toggle, string & data)
 {
        string lang = "ignore";
        if (font.language())
@@ -67,7 +67,7 @@ bool font2string(LyXFont const & font, bool toggle, string & data)
           << "number " << font.number() << '\n'
           << "color " << font.color() << '\n'
           << "language " << lang << '\n'
-          << "toggleall " << tostr(toggle);
+          << "toggleall " << convert<string>(toggle);
        data = os.str();
        return true;
 }
@@ -150,11 +150,11 @@ bool string2font(string const & data, LyXFont & font, bool & toggle)
 // the next two should probably go elsewhere
 // this give the position relative to (0, baseline) of outermost
 // paragraph
-Point coordOffset(DocIterator const & dit) 
+Point coordOffset(DocIterator const & dit)
 {
        int x = 0;
        int y = 0;
-       
+
        // Contribution of nested insets
        for (size_t i = 1; i != dit.size(); ++i) {
                CursorSlice const & sl = dit[i];
@@ -180,8 +180,8 @@ Point coordOffset(DocIterator const & dit)
 Point getPos(DocIterator const & dit)
 {
        CursorSlice const & bot = dit.bottom();
-       CoordCache::InnerParPosCache & cache = theCoords.pars_[bot.text()];
-       CoordCache::InnerParPosCache::iterator it = cache.find(bot.pit());
+       CoordCache::InnerParPosCache const & cache = theCoords.getParPos().find(bot.text())->second;
+       CoordCache::InnerParPosCache::const_iterator it = cache.find(bot.pit());
        if (it == cache.end()) {
                //lyxerr << "cursor out of view" << std::endl;
                return Point(-1,-1);
@@ -195,8 +195,8 @@ Point getPos(DocIterator const & dit)
 // this could be used elsewhere as well?
 CurStatus status(BufferView const * bv, DocIterator const & dit)
 {
-       CoordCache::InnerParPosCache & cache = theCoords.pars_[dit.bottom().text()];
-       
+       CoordCache::InnerParPosCache const & cache = theCoords.getParPos().find(dit.bottom().text())->second;
+
        if (cache.find(dit.bottom().pit()) != cache.end())
                return CUR_INSIDE;
        else if (dit.bottom().pit() < bv->anchor_ref())