Revert part of 21965 which was debugging code.

[lyx.git] / src / TextMetrics.cpp

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index 817b5f4a448507bcaadb03bc947916e2cb86519c..07f5e09995a8e169b4652796f4014f1fe49f775f 100644 (file)
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -27,7 +27,7 @@
 #include "CoordCache.h"
 #include "Cursor.h"
 #include "CutAndPaste.h"
-#include "debug.h"
+#include "support/debug.h"
 #include "FontIterator.h"
 #include "FuncRequest.h"
 #include "InsetList.h"
@@ -49,8 +49,6 @@
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
-#include <boost/current_function.hpp>
-
 using std::make_pair;
 using std::max;
 using std::min;
@@ -1221,8 +1219,7 @@ void TextMetrics::newParMetricsUp()
 pit_type TextMetrics::getPitNearY(int y)
 {
        BOOST_ASSERT(!text_->paragraphs().empty());
-       LYXERR(Debug::DEBUG, BOOST_CURRENT_FUNCTION
-               << ": y: " << y << " cache size: " << par_metrics_.size());
+       LYXERR(Debug::DEBUG, "y: " << y << " cache size: " << par_metrics_.size());
 
        // look for highest numbered paragraph with y coordinate less than given y
        pit_type pit = -1;
@@ -1262,8 +1259,7 @@ pit_type TextMetrics::getPitNearY(int y)
        }
 
        for (; it != et; ++it) {
-               LYXERR(Debug::DEBUG, BOOST_CURRENT_FUNCTION
-                       << "  examining: pit: " << it->first
+               LYXERR(Debug::DEBUG, "examining: pit: " << it->first
                        << " y: " << it->second.position());
 
                ParagraphMetrics const & pm = par_metrics_[it->first];
@@ -1274,8 +1270,7 @@ pit_type TextMetrics::getPitNearY(int y)
                }
        }
 
-       LYXERR(Debug::DEBUG, BOOST_CURRENT_FUNCTION
-               << ": found best y: " << yy << " for pit: " << pit);
+       LYXERR(Debug::DEBUG, "found best y: " << yy << " for pit: " << pit);
 
        return pit;
 }
@@ -1364,8 +1359,8 @@ void TextMetrics::setCursorFromCoordinates(Cursor & cur, int const x, int const
        ParagraphMetrics const & pm = par_metrics_[pit];
 
        int yy = pm.position() - pm.ascent();
-       LYXERR(Debug::DEBUG, BOOST_CURRENT_FUNCTION
-               << ": x: " << x << " y: " << y << " pit: " << pit << " yy: " << yy);
+       LYXERR(Debug::DEBUG, "x: " << x << " y: " << y <<
+               " pit: " << pit << " yy: " << yy);
 
        int r = 0;
        BOOST_ASSERT(pm.rows().size());
@@ -1378,15 +1373,13 @@ void TextMetrics::setCursorFromCoordinates(Cursor & cur, int const x, int const
 
        Row const & row = pm.rows()[r];
 
-       LYXERR(Debug::DEBUG, BOOST_CURRENT_FUNCTION
-               << ": row " << r << " from pos: " << row.pos());
+       LYXERR(Debug::DEBUG, "row " << r << " from pos: " << row.pos());
 
        bool bound = false;
        int xx = x;
        pos_type const pos = row.pos() + getColumnNearX(pit, row, xx, bound);
 
-       LYXERR(Debug::DEBUG, BOOST_CURRENT_FUNCTION
-               << ": setting cursor pit: " << pit << " pos: " << pos);
+       LYXERR(Debug::DEBUG, "setting cursor pit: " << pit << " pos: " << pos);
 
        text_->setCursor(cur, pit, pos, true, bound);
        // remember new position.
@@ -1403,41 +1396,36 @@ Inset * TextMetrics::checkInsetHit(int x, int y)
        Paragraph const & par = text_->paragraphs()[pit];
        ParagraphMetrics const & pm = par_metrics_[pit];
 
-       LYXERR(Debug::DEBUG, BOOST_CURRENT_FUNCTION
-               << ": x: " << x << " y: " << y << "  pit: " << pit);
+       LYXERR(Debug::DEBUG, "x: " << x << " y: " << y << "  pit: " << pit);
 
        InsetList::const_iterator iit = par.insetList().begin();
        InsetList::const_iterator iend = par.insetList().end();
        for (; iit != iend; ++iit) {
                Inset * inset = iit->inset;
 
-               LYXERR(Debug::DEBUG, BOOST_CURRENT_FUNCTION
-                       << ": examining inset " << inset);
+               LYXERR(Debug::DEBUG, "examining inset " << inset);
 
                if (!bv_->coordCache().getInsets().has(inset)) {
-                       LYXERR(Debug::DEBUG, BOOST_CURRENT_FUNCTION
-                               << ": inset has no cached position");
+                       LYXERR(Debug::DEBUG, "inset has no cached position");
                        return 0;
                }
 
                Dimension const & dim = pm.insetDimension(inset);
                Point p = bv_->coordCache().getInsets().xy(inset);
 
-               LYXERR(Debug::DEBUG, BOOST_CURRENT_FUNCTION
-                       << ": xo: " << p.x_ << "..." << p.x_ + dim.wid
+               LYXERR(Debug::DEBUG, "xo: " << p.x_ << "..." << p.x_ + dim.wid
                        << " yo: " << p.y_ - dim.asc << "..." << p.y_ + dim.des);
 
                if (x >= p.x_
                        && x <= p.x_ + dim.wid
                        && y >= p.y_ - dim.asc
                        && y <= p.y_ + dim.des) {
-                       LYXERR(Debug::DEBUG, BOOST_CURRENT_FUNCTION
-                               << ": Hit inset: " << inset);
+                       LYXERR(Debug::DEBUG, "Hit inset: " << inset);
                        return inset;
                }
        }
 
-       LYXERR(Debug::DEBUG, BOOST_CURRENT_FUNCTION << ": No inset hit. ");
+       LYXERR(Debug::DEBUG, "No inset hit. ");
        return 0;
 }