diff options
author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2014-07-25 13:19:03 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2014-07-29 08:39:33 +0200 |
commit | c67f7c0f0fc34887a4922a269815c460cbe3ccf8 (patch) | |
tree | ca04418b4cc59548dfeb8133af948c5e583afc57 /src/plugins/platforms/windows/qwindowsfontdatabase.h | |
parent | 87242756d44b6c1b697290b583484550694a9695 (diff) |
Windows/Direct2D platform plugins: Add Q_DECL_OVERRIDE.
Replace old virtual declarations by Q_DECL_OVERRIDE where
applicable.
Errors discovered: QWindowsScreen::primaryOrientation() did not
overwrite any method, changed to orientation().
Task-number: QTBUG-38858
Task-number: QTBUG-38993
Change-Id: Ie85d5235f3cd35c7a24cac3c1c7693c6508b1009
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Diffstat (limited to 'src/plugins/platforms/windows/qwindowsfontdatabase.h')
-rw-r--r-- | src/plugins/platforms/windows/qwindowsfontdatabase.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/plugins/platforms/windows/qwindowsfontdatabase.h b/src/plugins/platforms/windows/qwindowsfontdatabase.h index d0690b31a3..1ef346a430 100644 --- a/src/plugins/platforms/windows/qwindowsfontdatabase.h +++ b/src/plugins/platforms/windows/qwindowsfontdatabase.h @@ -77,17 +77,17 @@ public: QWindowsFontDatabase(); ~QWindowsFontDatabase(); - virtual void populateFontDatabase(); - virtual QFontEngineMulti *fontEngineMulti(QFontEngine *fontEngine, QChar::Script script); - virtual QFontEngine *fontEngine(const QFontDef &fontDef, void *handle); - virtual QFontEngine *fontEngine(const QByteArray &fontData, qreal pixelSize, QFont::HintingPreference hintingPreference); - virtual QStringList fallbacksForFamily(const QString &family, QFont::Style style, QFont::StyleHint styleHint, QChar::Script script) const; - virtual QStringList addApplicationFont(const QByteArray &fontData, const QString &fileName); - virtual void releaseHandle(void *handle); - virtual QString fontDir() const; - - virtual QFont defaultFont() const { return systemDefaultFont(); } - virtual bool fontsAlwaysScalable() const; + void populateFontDatabase() Q_DECL_OVERRIDE; + QFontEngineMulti *fontEngineMulti(QFontEngine *fontEngine, QChar::Script script) Q_DECL_OVERRIDE; + QFontEngine *fontEngine(const QFontDef &fontDef, void *handle) Q_DECL_OVERRIDE; + QFontEngine *fontEngine(const QByteArray &fontData, qreal pixelSize, QFont::HintingPreference hintingPreference) Q_DECL_OVERRIDE; + QStringList fallbacksForFamily(const QString &family, QFont::Style style, QFont::StyleHint styleHint, QChar::Script script) const Q_DECL_OVERRIDE; + QStringList addApplicationFont(const QByteArray &fontData, const QString &fileName) Q_DECL_OVERRIDE; + void releaseHandle(void *handle) Q_DECL_OVERRIDE; + QString fontDir() const Q_DECL_OVERRIDE; + + QFont defaultFont() const Q_DECL_OVERRIDE { return systemDefaultFont(); } + bool fontsAlwaysScalable() const Q_DECL_OVERRIDE; void derefUniqueFont(const QString &uniqueFont); void refUniqueFont(const QString &uniqueFont); |