AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[QFontDatabase] Drop QtFontDesc's familyIndex member

Browse Source 
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>
This commit is contained in:
Konstantin Ritt 2015-04-24 05:48:22 +04:00
parent 9bf6ea7fde
commit a77dc1a669
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/text/qfontdatabase.cpp
View File

@ -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;