Complete the removal of the embedding stuff. Maybe. It's hard to be sure we got every...

[lyx.git] / src / frontends / qt4 / GuiFontMetrics.cpp

diff --git a/src/frontends/qt4/GuiFontMetrics.cpp b/src/frontends/qt4/GuiFontMetrics.cpp
index de83340cba35f437babc8fcb8c303047c427385d..4e16f10da2d21a41e2f3e618828676f271d7d6bf 100644 (file)
--- a/src/frontends/qt4/GuiFontMetrics.cpp
+++ b/src/frontends/qt4/GuiFontMetrics.cpp
@@ -20,7 +20,7 @@
 
 #include "insets/Inset.h"
 
-#include <boost/assert.hpp>
+#include "support/assert.h"
 
 using namespace std;
 
@@ -36,7 +36,7 @@ namespace frontend {
  */
 static inline QChar const ucs4_to_qchar(char_type const ucs4)
 {
-       BOOST_ASSERT(is_utf16(ucs4));
+       LASSERT(is_utf16(ucs4), /**/);
        return QChar(static_cast<unsigned short>(ucs4));
 }
 
@@ -177,11 +177,11 @@ int GuiFontMetrics::signedWidth(docstring const & s) const
 }
 
 
-static int const d = Inset::TEXT_TO_INSET_OFFSET / 2;
-
 void GuiFontMetrics::rectText(docstring const & str,
        int & w, int & ascent, int & descent) const
 {
+       static int const d = Inset::TEXT_TO_INSET_OFFSET / 2;
+
        w = width(str) + Inset::TEXT_TO_INSET_OFFSET;
        ascent = metrics_.ascent() + d;
        descent = metrics_.descent() + d;