Commit a77dc1a6 authored by Konstantin Ritt's avatar Konstantin Ritt
Browse files

[QFontDatabase] Drop QtFontDesc's familyIndex member


Many times set but never used.

Change-Id: I297f21d4b9878e5f9559a2dfdb2d3de34107bb7d
Reviewed-by: default avatarSimon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: default avatarFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Showing with 1 addition and 4 deletions
...@@ -617,13 +617,12 @@ static void parseFontName(const QString &name, QString &foundry, QString &family ...@@ -617,13 +617,12 @@ static void parseFontName(const QString &name, QString &foundry, QString &family
struct QtFontDesc 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; QtFontFamily *family;
QtFontFoundry *foundry; QtFontFoundry *foundry;
QtFontStyle *style; QtFontStyle *style;
QtFontSize *size; QtFontSize *size;
QtFontEncoding *encoding; QtFontEncoding *encoding;
int familyIndex;
}; };
static int match(int script, const QFontDef &request, static int match(int script, const QFontDef &request,
...@@ -1157,7 +1156,6 @@ static int match(int script, const QFontDef &request, ...@@ -1157,7 +1156,6 @@ static int match(int script, const QFontDef &request,
desc->style = 0; desc->style = 0;
desc->size = 0; desc->size = 0;
desc->encoding = 0; desc->encoding = 0;
desc->familyIndex = -1;
unsigned int score = ~0u; unsigned int score = ~0u;
...@@ -1174,7 +1172,6 @@ static int match(int script, const QFontDef &request, ...@@ -1174,7 +1172,6 @@ static int match(int script, const QFontDef &request,
continue; continue;
QtFontDesc test; QtFontDesc test;
test.family = db->families[x]; test.family = db->families[x];
test.familyIndex = x;
if (!matchFamilyName(family_name, test.family)) if (!matchFamilyName(family_name, test.family))
continue; continue;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment