X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCoordCache.cpp;h=8ab101ba804e6303c1b552561b32f715c5c35098;hb=da1c04ea9a13dcfe75ad7e727811e9d3004609aa;hp=b540679544e1542c2f53169b716586e4a337f539;hpb=51fbea02a8f7dc1e360a61bdc95d5ac9200cb5f6;p=lyx.git

diff --git a/src/CoordCache.cpp b/src/CoordCache.cpp
index b540679544..8ab101ba80 100644
--- a/src/CoordCache.cpp
+++ b/src/CoordCache.cpp
@@ -12,9 +12,9 @@
 #include "CoordCache.h"
 #include "debug.h"
 
-#include "LyXText.h"
+#include "Text.h"
 
-#include "insets/InsetBase.h"
+#include "insets/Inset.h"
 
 #include <boost/assert.hpp>
 
@@ -49,7 +49,7 @@ void CoordCache::clear()
 }
 
 
-Point CoordCache::get(LyXText const * text, pit_type pit) const
+Point CoordCache::get(Text const * text, pit_type pit) const
 {
 	ParPosCache::const_iterator const it = pars_.find(text);
 	BOOST_ASSERT(it != pars_.end());
@@ -62,27 +62,28 @@ Point CoordCache::get(LyXText const * text, pit_type pit) const
 void CoordCache::dump() const
 {
 	lyxerr << "ParPosCache contains:" << std::endl;
-	for (ParPosCache::const_iterator i = getParPos().begin(); i != getParPos().end(); ++i) {
-		LyXText const * lt = (*i).first;
-		InnerParPosCache const & cache = (*i).second;
-		lyxerr << "LyXText:" << lt << std::endl;
-		for (InnerParPosCache::const_iterator j = cache.begin(); j != cache.end(); ++j) {
-			pit_type pit = (*j).first;
+	for (ParPosCache::const_iterator it = getParPos().begin(); it != getParPos().end(); ++it) {
+		Text const * lt = it->first;
+		InnerParPosCache const & cache = it->second;
+		lyxerr << "Text:" << lt << std::endl;
+		for (InnerParPosCache::const_iterator jt = cache.begin(); jt != cache.end(); ++jt) {
+			pit_type pit = jt->first;
 			Paragraph const & par = lt->getPar(pit);
-			Point p = (*j).second;
+			Point p = jt->second;
 			lyxerr << "Paragraph " << pit << ": \"";
-			for (int k = 0; k < std::min(static_cast<lyx::pos_type>(10), par.size()); ++k) {
-				lyxerr << to_utf8(docstring(1,par.getChar(k)));
-			}
+			int const n = std::min(static_cast<lyx::pos_type>(10), par.size());
+			for (int k = 0; k < n; ++k)
+				lyxerr << to_utf8(docstring(1, par.getChar(k)));
 			lyxerr << "\" has point " << p.x_ << "," << p.y_ << std::endl;
 		}
 	}
 
 	lyxerr << "InsetCache contains:" << std::endl;
-	for (CoordCacheBase<InsetBase>::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 << "(" << to_utf8(inset->getInsetName()) << ") has point " << p.x_ << "," << p.y_ << std::endl;
+	for (CoordCacheBase<Inset>::cache_type::const_iterator it = getInsets().getData().begin(); it != getInsets().getData().end(); ++it) {
+		Inset const * inset = it->first;
+		Point const p = it->second;
+		lyxerr << "Inset " << inset << "(" << to_utf8(inset->name())
+			<< ") has point " << p.x_ << "," << p.y_ << std::endl;
 	}
 }