diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2014-02-04 21:24:12 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-06 11:38:32 +0100 |
| commit | b13b63e99c5d23518217b90b6396bc3c9659d2f2 (patch) | |
| tree | 5a841714bee281134cd733732ebdd1c4632e321f | |
| parent | 11fe2bcd7b3b62e61b06b1bc0794cd538431a696 (diff) | |
Clean-up some leftovers
Change-Id: Ia7fb57831af55cf8e0403dbdef2e73f9957fccf7
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| -rw-r--r-- | src/gui/text/qfontdatabase.h | 2 | ||||
| -rw-r--r-- | src/gui/text/qfontdatabase_qpa.cpp | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/gui/text/qfontdatabase.h b/src/gui/text/qfontdatabase.h index 708b8cbd58..9986ef6c60 100644 --- a/src/gui/text/qfontdatabase.h +++ b/src/gui/text/qfontdatabase.h @@ -167,8 +167,6 @@ private: friend class QFontPrivate; friend class QFontDialog; friend class QFontDialogPrivate; - friend class QFontEngineMultiXLFD; - friend class QFontEngineMultiQWS; friend class QFontEngineMultiQPA; QFontDatabasePrivate *d; diff --git a/src/gui/text/qfontdatabase_qpa.cpp b/src/gui/text/qfontdatabase_qpa.cpp index 6f4971e267..fab4d6bc73 100644 --- a/src/gui/text/qfontdatabase_qpa.cpp +++ b/src/gui/text/qfontdatabase_qpa.cpp @@ -184,8 +184,7 @@ QFontEngine *loadSingleEngine(int script, if (!engine) { engine = pfdb->fontEngine(def, QChar::Script(script), size->handle); if (engine) { - QFontCache::Key key(def,script); - QFontCache::instance()->instance()->insertEngine(key,engine); + QFontCache::instance()->insertEngine(key, engine); } } return engine; @@ -221,10 +220,10 @@ QFontEngine *loadEngine(int script, const QFontDef &request, pfMultiEngine->setFallbackFamiliesList(fallbacks); engine = pfMultiEngine; - // Cache Multi font engine as well in case we got the FT single + // Cache Multi font engine as well in case we got the single // font engine when we are actually looking for a Multi one QFontCache::Key key(request, script, 1); - QFontCache::instance()->instance()->insertEngine(key, engine); + QFontCache::instance()->insertEngine(key, engine); } return engine; |