diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2014-11-25 15:37:40 +0400 |
|---|---|---|
| committer | Konstantin Ritt <ritt.ks@gmail.com> | 2014-11-26 01:28:38 +0100 |
| commit | 8e3fdf13543f43d7a4cb4fa41f7279f9a5d274d3 (patch) | |
| tree | 45e2382c3293efbee0f19cef78405b9b8b939f2b /src/platformsupport/fontdatabases/fontconfig/qfontenginemultifontconfig.cpp | |
| parent | f4191888eb6355c5a63fdc20d144e9afa6910950 (diff) | |
Merge QFontEngineMultiBasicImpl and QFontEngineMulti
Minor refactoring also improves the behavior and the code readability.
Change-Id: Id89dd224f4132a4c0dfbc16f414ef42cc8d8a4da
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Diffstat (limited to 'src/platformsupport/fontdatabases/fontconfig/qfontenginemultifontconfig.cpp')
| -rw-r--r-- | src/platformsupport/fontdatabases/fontconfig/qfontenginemultifontconfig.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/platformsupport/fontdatabases/fontconfig/qfontenginemultifontconfig.cpp b/src/platformsupport/fontdatabases/fontconfig/qfontenginemultifontconfig.cpp index 956cf68290..b0460814ca 100644 --- a/src/platformsupport/fontdatabases/fontconfig/qfontenginemultifontconfig.cpp +++ b/src/platformsupport/fontdatabases/fontconfig/qfontenginemultifontconfig.cpp @@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE QFontEngineMultiFontConfig::QFontEngineMultiFontConfig(QFontEngine *fe, int script) - : QFontEngineMultiBasicImpl(fe, script) + : QFontEngineMulti(fe, script) { } @@ -67,8 +67,8 @@ bool QFontEngineMultiFontConfig::shouldLoadFontEngineForCharacter(int at, uint u FcPattern * QFontEngineMultiFontConfig::getMatchPatternForFallback(int fallBackIndex) const { Q_ASSERT(fallBackIndex < fallbackFamilyCount()); - if (engines.size() - 1 > cachedMatchPatterns.size()) - cachedMatchPatterns.resize(engines.size() - 1); + if (fallbackFamilyCount() > cachedMatchPatterns.size()) + cachedMatchPatterns.resize(fallbackFamilyCount()); FcPattern *ret = cachedMatchPatterns.at(fallBackIndex); if (ret) return ret; |