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 b6eb96927817a28cb7630627d38cf2600de53e5d..4e16f10da2d21a41e2f3e618828676f271d7d6bf 100644 (file)
--- a/src/frontends/qt4/GuiFontMetrics.cpp
+++ b/src/frontends/qt4/GuiFontMetrics.cpp
@@ -18,11 +18,11 @@
 #include "Language.h"
 #include "Dimension.h"
 
-#include "support/unicode.h"
+#include "insets/Inset.h"
 
-#include <boost/assert.hpp>
+#include "support/assert.h"
 
-using std::string;
+using namespace std;
 
 namespace lyx {
 namespace frontend {
@@ -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));
 }
 
@@ -180,8 +180,9 @@ int GuiFontMetrics::signedWidth(docstring const & s) const
 void GuiFontMetrics::rectText(docstring const & str,
        int & w, int & ascent, int & descent) const
 {
-       static int const d = 2;
-       w = width(str) + d * 2 + 2;
+       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;
 }
@@ -191,10 +192,8 @@ void GuiFontMetrics::rectText(docstring const & str,
 void GuiFontMetrics::buttonText(docstring const & str,
        int & w, int & ascent, int & descent) const
 {
-       static int const d = 3;
-       w = width(str) + d * 2 + 2;
-       ascent = metrics_.ascent() + d;
-       descent = metrics_.descent() + d;
+       rectText(str, w, ascent, descent);
+       w += Inset::TEXT_TO_INSET_OFFSET;
 }