I'll find a solution for the 'dirList problem', Abdel.

[lyx.git] / src / BufferView.cpp

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 84c877f55a9f0c99d9d44a9cb1ca8ddf41d0fcea..5754d6ed29e70f7acd51020a1ee17aed2d7130bf 100644 (file)
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -23,7 +23,6 @@
 #include "CoordCache.h"
 #include "Cursor.h"
 #include "CutAndPaste.h"
-#include "debug.h"
 #include "DispatchResult.h"
 #include "EmbeddedFiles.h"
 #include "ErrorList.h"
@@ -31,7 +30,6 @@
 #include "FloatList.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "gettext.h"
 #include "Intl.h"
 #include "InsetIterator.h"
 #include "Language.h"
@@ -69,14 +67,14 @@
 #include "graphics/Previews.h"
 
 #include "support/convert.h"
-#include "support/lstrings.h"
+#include "support/debug.h"
 #include "support/FileFilterList.h"
 #include "support/filetools.h"
+#include "support/gettext.h"
+#include "support/lstrings.h"
 #include "support/Package.h"
 #include "support/types.h"
 
-#include <boost/current_function.hpp>
-
 #include <cerrno>
 #include <fstream>
 #include <functional>
@@ -449,8 +447,8 @@ void BufferView::updateScrollbar()
                d->offset_ref_ = 0;
        }
 
-       LYXERR(Debug::GUI, BOOST_CURRENT_FUNCTION
-               << " Updating scrollbar: height: " << t.paragraphs().size()
+       LYXERR(Debug::GUI, " Updating scrollbar: height: "
+               << t.paragraphs().size()
                << " curr par: " << d->cursor_.bottom().pit()
                << " default height " << defaultRowHeight());
 
@@ -501,7 +499,7 @@ ScrollbarParameters const & BufferView::scrollbarParameters() const
 
 void BufferView::scrollDocView(int value)
 {
-       LYXERR(Debug::GUI, BOOST_CURRENT_FUNCTION << "[ value = " << value << "]");
+       LYXERR(Debug::GUI, "[ value = " << value << "]");
 
        Text & t = buffer_.text();
        TextMetrics & tm = d->text_metrics_[&t];
@@ -863,12 +861,10 @@ FuncStatus BufferView::getStatus(FuncRequest const & cmd)
 
 Update::flags BufferView::dispatch(FuncRequest const & cmd)
 {
-       //lyxerr << BOOST_CURRENT_FUNCTION
-       //       << [ cmd = " << cmd << "]" << endl;
+       //lyxerr << [ cmd = " << cmd << "]" << endl;
 
        // Make sure that the cached BufferView is correct.
-       LYXERR(Debug::ACTION, BOOST_CURRENT_FUNCTION
-               << " action[" << cmd.action << ']'
+       LYXERR(Debug::ACTION, " action[" << cmd.action << ']'
                << " arg[" << to_utf8(cmd.argument()) << ']'
                << " x[" << cmd.x << ']'
                << " y[" << cmd.y << ']'
@@ -1308,7 +1304,7 @@ Inset const * BufferView::getCoveringInset(Text const & text, int x, int y)
 
 void BufferView::mouseEventDispatch(FuncRequest const & cmd0)
 {
-       //lyxerr << BOOST_CURRENT_FUNCTION << "[ cmd0 " << cmd0 << "]" << endl;
+       //lyxerr << "[ cmd0 " << cmd0 << "]" << endl;
 
        // This is only called for mouse related events including
        // LFUN_FILE_OPEN generated by drag-and-drop.
@@ -1648,8 +1644,7 @@ bool BufferView::singleParUpdate()
 
        d->update_strategy_ = SingleParUpdate;
 
-       LYXERR(Debug::PAINTING, BOOST_CURRENT_FUNCTION
-               << "\ny1: " << pm.position() - pm.ascent()
+       LYXERR(Debug::PAINTING, "\ny1: " << pm.position() - pm.ascent()
                << " y2: " << pm.position() + pm.descent()
                << " pit: " << bottom_pit
                << " singlepar: 1");
@@ -1724,8 +1719,7 @@ void BufferView::updateMetrics()
        // Take care of descent of last line
        y2 += tm.parMetrics(pit2).descent();
 
-       LYXERR(Debug::PAINTING, BOOST_CURRENT_FUNCTION
-               << "\n y1: " << y1
+       LYXERR(Debug::PAINTING, "\n y1: " << y1
                << " y2: " << y2
                << " pit1: " << pit1
                << " pit2: " << pit2