summaryrefslogtreecommitdiffstats
path: root/src/platformsupport/fontdatabases/winrt
diff options
context:
space:
mode:
authorAlexander Volkov <a.volkov@rusbitech.ru>2016-11-30 12:47:22 +0300
committerAlexander Volkov <a.volkov@rusbitech.ru>2016-11-30 10:51:36 +0000
commitaac3a4c032d3aa96c8c25402bbc72c78348401d0 (patch)
tree9642730ae95fd6ca6addb4858e055f5c3c2950eb /src/platformsupport/fontdatabases/winrt
parent0a2759e8f8c0fa295eff1a5bb5aefd074851d5d6 (diff)
winrt: Replace Q_DECL_OVERRIDE by override
We can use 'override' keyword directly since Qt 5.7. Change-Id: I31127478a0a96798a4e018d9996842204e307552 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Diffstat (limited to 'src/platformsupport/fontdatabases/winrt')
-rw-r--r--src/platformsupport/fontdatabases/winrt/qwinrtfontdatabase_p.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/platformsupport/fontdatabases/winrt/qwinrtfontdatabase_p.h b/src/platformsupport/fontdatabases/winrt/qwinrtfontdatabase_p.h
index 9559bac0a8..e0971c4e95 100644
--- a/src/platformsupport/fontdatabases/winrt/qwinrtfontdatabase_p.h
+++ b/src/platformsupport/fontdatabases/winrt/qwinrtfontdatabase_p.h
@@ -72,14 +72,14 @@ class QWinRTFontDatabase : public QBasicFontDatabase
public:
QString fontDir() const;
~QWinRTFontDatabase();
- QFont defaultFont() const Q_DECL_OVERRIDE;
- bool fontsAlwaysScalable() const Q_DECL_OVERRIDE;
- void populateFontDatabase() Q_DECL_OVERRIDE;
- void populateFamily(const QString &familyName) Q_DECL_OVERRIDE;
- QFontEngine *fontEngine(const QFontDef &fontDef, void *handle) Q_DECL_OVERRIDE;
+ QFont defaultFont() const override;
+ bool fontsAlwaysScalable() const override;
+ void populateFontDatabase() override;
+ void populateFamily(const QString &familyName) override;
+ QFontEngine *fontEngine(const QFontDef &fontDef, void *handle) override;
QStringList fallbacksForFamily(const QString &family, QFont::Style style,
- QFont::StyleHint styleHint, QChar::Script script) const Q_DECL_OVERRIDE;
- void releaseHandle(void *handle) Q_DECL_OVERRIDE;
+ QFont::StyleHint styleHint, QChar::Script script) const override;
+ void releaseHandle(void *handle) override;
private:
QHash<IDWriteFontFile *, FontDescription> m_fonts;
QHash<QString, IDWriteFontFamily *> m_fontFamilies;