cosmetics

[lyx.git] / src / CoordCache.cpp

diff --git a/src/CoordCache.cpp b/src/CoordCache.cpp
index 8789fa63a6d74a8f55bd8eeabceb708b962fce21..773d8c7bc422d374bf7f36063f0c667d9b64d591 100644 (file)
--- a/src/CoordCache.cpp
+++ b/src/CoordCache.cpp
@@ -10,10 +10,12 @@
 #include <config.h>
 
 #include "CoordCache.h"
-#include "debug.h"
 
 #include "Text.h"
 
+#include "support/debug.h"
+#include "support/docstring.h"
+
 #include "insets/Inset.h"
 
 #include <boost/assert.hpp>
@@ -33,8 +35,8 @@ Point::Point(int x, int y)
 // just a helper to be able to set a breakpoint
 void lyxbreaker(void const * data, const char * hint, int size)
 {
-       lyxerr << "break on pointer: " << data << " hint: " << hint
-               << " size: " << size << std::endl;
+       LYXERR0("break on pointer: " << data << " hint: " << hint
+               << " size: " << size);
        BOOST_ASSERT(false);
 }
 
@@ -43,47 +45,17 @@ void CoordCache::clear()
 {
        arrays_.clear();
        insets_.clear();
-       pars_.clear();
-       slices0_.clear();
-       slices1_.clear();
-}
-
-
-Point CoordCache::get(Text const * text, pit_type pit) const
-{
-       ParPosCache::const_iterator const it = pars_.find(text);
-       BOOST_ASSERT(it != pars_.end());
-       InnerParPosCache::const_iterator const posit = it->second.find(pit);
-       BOOST_ASSERT(posit != it->second.end());
-       return posit->second;
 }
 
 
 void CoordCache::dump() const
 {
-       lyxerr << "ParPosCache contains:" << std::endl;
-       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 = jt->second;
-                       lyxerr << "Paragraph " << pit << ": \"";
-                       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;
+       LYXERR0("InsetCache contains:");
        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->insetName())
-                       << ") has point " << p.x_ << "," << p.y_ << std::endl;
+               Point const p = it->second.pos;
+               LYXERR0("Inset " << inset << "(" << to_utf8(inset->name())
+                       << ") has point " << p.x_ << "," << p.y_);
        }
 }