From a77dc1a669ed197514fe29333b94e037f5285cd8 Mon Sep 17 00:00:00 2001
From: Konstantin Ritt <ritt.ks@gmail.com>
Date: Fri, 24 Apr 2015 05:48:22 +0400
Subject: [QFontDatabase] Drop QtFontDesc's familyIndex member

Many times set but never used.

Change-Id: I297f21d4b9878e5f9559a2dfdb2d3de34107bb7d
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
---
 src/gui/text/qfontdatabase.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'src/gui')

diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp
index af3fe72948..f3e071a20a 100644
--- a/src/gui/text/qfontdatabase.cpp
+++ b/src/gui/text/qfontdatabase.cpp
@@ -617,13 +617,12 @@ static void parseFontName(const QString &name, QString &foundry, QString &family
 
 struct QtFontDesc
 {
-    inline QtFontDesc() : family(0), foundry(0), style(0), size(0), encoding(0), familyIndex(-1) {}
+    inline QtFontDesc() : family(0), foundry(0), style(0), size(0), encoding(0) {}
     QtFontFamily *family;
     QtFontFoundry *foundry;
     QtFontStyle *style;
     QtFontSize *size;
     QtFontEncoding *encoding;
-    int familyIndex;
 };
 
 static int match(int script, const QFontDef &request,
@@ -1157,7 +1156,6 @@ static int match(int script, const QFontDef &request,
     desc->style = 0;
     desc->size = 0;
     desc->encoding = 0;
-    desc->familyIndex = -1;
 
     unsigned int score = ~0u;
 
@@ -1174,7 +1172,6 @@ static int match(int script, const QFontDef &request,
             continue;
         QtFontDesc test;
         test.family = db->families[x];
-        test.familyIndex = x;
 
         if (!matchFamilyName(family_name, test.family))
             continue;
-- 
cgit v1.2.3