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

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

diff --git a/src/frontends/qt4/GuiFontMetrics.h b/src/frontends/qt4/GuiFontMetrics.h
index e2e168a9ff9464deea2cde79841c4d4c38ab354a..4f83c3807a96c288f1ed5b459fb8a51cc22570cd 100644 (file)
--- a/src/frontends/qt4/GuiFontMetrics.h
+++ b/src/frontends/qt4/GuiFontMetrics.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file FontMetrics.h
+ * \file GuiFontMetrics.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -9,8 +9,8 @@
  * Full author contact details are available in file CREDITS.
  */
 
-#ifndef QT4_FONT_METRICS_H
-#define QT4_FONT_METRICS_H
+#ifndef GUI_FONT_METRICS_H
+#define GUI_FONT_METRICS_H
 
 #include "frontends/FontMetrics.h"
 
@@ -19,19 +19,12 @@
 #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
-#endif
-
 namespace lyx {
 namespace frontend {
 
-class GuiFontMetrics: public FontMetrics
+class GuiFontMetrics : public FontMetrics
 {
 public:
-
        GuiFontMetrics(QFont const & font);
        GuiFontMetrics(QFont const & font, QFont const & smallcaps_font);
 
@@ -39,19 +32,16 @@ public:
 
        virtual int maxAscent() const;
        virtual int maxDescent() const;
-#ifndef USE_LYX_FONTCACHE
-       virtual int width(char_type c) const {
-               return metrics_.width(QChar(static_cast<short int>(c)));
-       }
-#else
+       virtual Dimension const defaultDimension() const;
        virtual int width(char_type c) const;
-#endif
        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(char_type const * s, size_t n) 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,
@@ -64,7 +54,7 @@ public:
        int width(QString const & str) const;
 
 private:
-       int smallcapsWidth(QString const & s) const;
+       int smallcapsWidth(char_type c) const;
 
        /// Metrics on the font
        QFontMetrics metrics_;
@@ -72,28 +62,23 @@ private:
 
        bool smallcaps_shape_;
 
-#ifdef USE_LYX_FONTCACHE
-
        /// Cache of char widths
-       /** This cache adds 20Mo of memory to the LyX executable when
-       * loading UserGuide.lyx which contains a good number of fonts. If
-       * this turns out to be too much, we can switch to a \c QHash based
-       * solution.
-       **/
        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;
+       AscendDescend const fillMetricsCache(char_type) const;
 
-#endif // USE_LYX_FONTCACHE
+       /// Cache of char right bearings
+       mutable QHash<char_type, int> rbearing_cache_;
 };
 
 } // namespace frontend
 } // namespace lyx
 
-#endif // QT4_FONT_METRICS_H
+#endif // GUI_FONT_METRICS_H