Fix handling of the add branch textfield in GuiBranches

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

diff --git a/src/frontends/qt4/GuiFontMetrics.cpp b/src/frontends/qt4/GuiFontMetrics.cpp
index 76ebd907064e088a442cdd03fb2097196c1a2f8e..799121b173703539b5c1699986d0412c36d5b71f 100644 (file)
--- a/src/frontends/qt4/GuiFontMetrics.cpp
+++ b/src/frontends/qt4/GuiFontMetrics.cpp
@@ -27,35 +27,36 @@ using namespace std;
 namespace lyx {
 namespace frontend {
 
+namespace {
 /**
  * Convert a UCS4 character into a QChar.
  * This is a hack (it does only make sense for the common part of the UCS4
  * and UTF16 encodings) and should not be used.
  * This does only exist because of performance reasons (a real conversion
  * using iconv is too slow on windows).
- */
-static inline QChar const ucs4_to_qchar(char_type const ucs4)
+ *
+ * This is no real conversion but a simple cast in reality. This is the reason
+ * why this works well for symbol fonts used in mathed too, even though
+ * these are not real ucs4 characters. These are codepoints in the
+ * modern fonts used, nothing unicode related.
+ * See comment in QLPainter::text() for more explanation.
+ **/   
+inline QChar const ucs4_to_qchar(char_type const ucs4)
 {
        LASSERT(is_utf16(ucs4), /**/);
        return QChar(static_cast<unsigned short>(ucs4));
 }
+} // anon namespace
 
 
-// Caution: When using ucs4_to_qchar() in these methods, this is no
-// real conversion but a simple cast in reality. This is the reason
-// why this works well for symbol fonts used in mathed too, even though
-// these are not real ucs4 characters. These are codepoints in the
-// modern fonts used, nothing unicode related.
-// See comment in QLPainter::text() for more explanation.
-
 GuiFontMetrics::GuiFontMetrics(QFont const & font)
-: metrics_(font), smallcaps_metrics_(font), smallcaps_shape_(false)
+: metrics_(font, 0), smallcaps_metrics_(font), smallcaps_shape_(false)
 {
 }
 
 
 GuiFontMetrics::GuiFontMetrics(QFont const & font, QFont const & smallcaps_font)
-: metrics_(font), smallcaps_metrics_(smallcaps_font), smallcaps_shape_(true)
+: metrics_(font, 0), smallcaps_metrics_(smallcaps_font), smallcaps_shape_(true)
 {
 }