X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fcoordcache.C;h=b55b296ef13b4adc000914b06f43c6fa0d84de83;hb=cd4033aef3a3f1efdb5a676b8bab3d367f53a830;hp=cd652063d53e137bc877b98b3a431625fff72140;hpb=6ac15c5bb9eb7c692918c9bf753b283b8b573910;p=lyx.git diff --git a/src/coordcache.C b/src/coordcache.C index cd652063d5..b55b296ef1 100644 --- a/src/coordcache.C +++ b/src/coordcache.C @@ -49,11 +49,11 @@ void CoordCache::clear() } -Point CoordCache::get(LyXText const * text, pit_type pit) +Point CoordCache::get(LyXText const * text, pit_type pit) const { - ParPosCache::iterator const it = pars_.find(text); + ParPosCache::const_iterator const it = pars_.find(text); BOOST_ASSERT(it != pars_.end()); - InnerParPosCache::iterator const posit = it->second.find(pit); + InnerParPosCache::const_iterator const posit = it->second.find(pit); BOOST_ASSERT(posit != it->second.end()); return posit->second; } @@ -70,7 +70,7 @@ CoordCache::dump() const { Paragraph const & par = lt->getPar(pit); Point p = (*j).second; lyxerr << "Paragraph " << pit << ": \""; - for (int k = 0; k < std::min(10, par.size()); ++k) { + for (int k = 0; k < std::min(static_cast(10), par.size()); ++k) { lyxerr << to_utf8(docstring(1,par.getChar(k))); } lyxerr << "\" has point " << p.x_ << "," << p.y_ << std::endl; @@ -81,7 +81,7 @@ CoordCache::dump() const { for (CoordCacheBase::cache_type::const_iterator i = getInsets().getData().begin(); i != getInsets().getData().end(); ++i) { InsetBase const * inset = (*i).first; Point p = (*i).second; - lyxerr << "Inset " << inset << "(" << inset->getInsetName() << ") has point " << p.x_ << "," << p.y_ << std::endl; + lyxerr << "Inset " << inset << "(" << to_utf8(inset->getInsetName()) << ") has point " << p.x_ << "," << p.y_ << std::endl; } }