Enable Font width caching.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13931 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/qfont_loader.C b/src/frontends/qt4/qfont_loader.C
index f11bec325c79062abce16736c6524f02850aa319..ff41ba9ba23a6ee3262b65883b9132eef7b302d6 100644 (file)
--- a/src/frontends/qt4/qfont_loader.C
+++ b/src/frontends/qt4/qfont_loader.C
@@ -356,7 +356,7 @@ QLFontInfo::QLFontInfo(LyXFont const & f)
 }
 
 
-int QLFontInfo::width(Uchar val) const
+int QLFontInfo::width(Uchar val)
 {
 // Starting with version 3.1.0, Qt/X11 does its own caching of
 // character width, so it is not necessary to provide ours.

diff --git a/src/frontends/qt4/qfont_loader.h b/src/frontends/qt4/qfont_loader.h
index d4c41ec2aa14a7edd0bf677bab4c710127404149..ca9fe8c5ad0d95c7b6b50b48bb5732c4d7c3b43f 100644 (file)
--- a/src/frontends/qt4/qfont_loader.h
+++ b/src/frontends/qt4/qfont_loader.h
@@ -18,9 +18,9 @@
 #include <QFont>
 #include <QFontMetrics>
 
-#if QT_VERSION < 0x030100
+//#if QT_VERSION < 0x030100
 #define USE_LYX_FONTCACHE
-#endif
+//#endif
 
 #if defined(USE_LYX_FONTCACHE)
 #include <map>
@@ -35,7 +35,7 @@ public:
        QLFontInfo(LyXFont const & f);
 
        /// Return pixel width for the given unicode char
-       int width(Uchar val) const;
+       int width(Uchar val);
 
        /// The font instance
        QFont font;