* support/qstring_helpers.h: erase ucs4_to_qstring() method.

[features.git] / src / frontends / qt4 / GuiFontMetrics.h

diff --git a/src/frontends/qt4/GuiFontMetrics.h b/src/frontends/qt4/GuiFontMetrics.h
index 08e6975c6cbb181509c106c90a63888060ec8a15..59a03c3a471dfb9aec8bf5029e601cd2b12caa9d 100644 (file)
--- a/src/frontends/qt4/GuiFontMetrics.h
+++ b/src/frontends/qt4/GuiFontMetrics.h
@@ -17,13 +17,8 @@
 #include "support/docstring.h"
 
 #include <QFontMetrics>
+#include <QHash>
 
-// Starting with version 3.1.0, Qt/X11 does its own caching of
-// character width, so it is not necessary to provide ours.
-#if defined(Q_WS_MACX) || defined(Q_WS_WIN32)
-#define USE_LYX_FONTCACHE
-#include <map>
-#endif
 
 namespace lyx {
 namespace frontend {
@@ -39,17 +34,21 @@ public:
 
        virtual int maxAscent() const;
        virtual int maxDescent() const;
-       virtual int ascent(lyx::char_type c) const;
-       int descent(lyx::char_type c) const;
-       virtual int lbearing(lyx::char_type c) const;
-       virtual int rbearing(lyx::char_type c) const;
-       virtual int width(lyx::char_type const * s, size_t n) const;
-       virtual int signedWidth(lyx::docstring const & s) const;
-       virtual void rectText(lyx::docstring const & str,
+       virtual Dimension const defaultDimension() const;
+       virtual int width(char_type c) const;
+       virtual int ascent(char_type c) const;
+       virtual int descent(char_type c) const;
+       virtual int lbearing(char_type c) const;
+       virtual int rbearing(char_type c) const;
+       virtual int width(docstring const & s) const;
+       virtual int signedWidth(docstring const & s) const;
+       virtual Dimension const dimension(char_type c) const;
+
+       virtual void rectText(docstring const & str,
                int & width,
                int & ascent,
                int & descent) const;
-       virtual void buttonText(lyx::docstring const & str,
+       virtual void buttonText(docstring const & str,
                int & width,
                int & ascent,
                int & descent) const;
@@ -65,18 +64,17 @@ private:
 
        bool smallcaps_shape_;
 
-#ifndef USE_LYX_FONTCACHE
-       /// Return pixel width for the given unicode char
-       int width(unsigned short val) const { return metrics_.width(QChar(val)); }
-
-#else
-       /// Return pixel width for the given unicode char
-       int width(unsigned short val) const;
-
-       typedef std::map<unsigned short, int> WidthCache;
        /// Cache of char widths
-       mutable WidthCache widthcache;
-#endif // USE_LYX_FONTCACHE
+       mutable QHash<char_type, int> width_cache_;
+
+       struct AscendDescend {
+               short int ascent;
+               short int descent;
+       };
+       /// Cache of char ascends and descends
+       mutable QHash<char_type, AscendDescend> metrics_cache_;
+       /// fill in \c metrics_cache_ at specified value.
+       void fillMetricsCache(char_type) const;
 };
 
 } // namespace frontend