From a7c2820c497d52ef0313ae80e094252e72ec9dd3 Mon Sep 17 00:00:00 2001
From: Abdelrazak Younes <younes@lyx.org>
Date: Thu, 25 May 2006 22:37:01 +0000
Subject: [PATCH] Enable Font width caching.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13931 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/qt4/qfont_loader.C | 2 +-
 src/frontends/qt4/qfont_loader.h | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/frontends/qt4/qfont_loader.C b/src/frontends/qt4/qfont_loader.C
index f11bec325c..ff41ba9ba2 100644
--- 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 d4c41ec2aa..ca9fe8c5ad 100644
--- 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;
-- 
2.39.2