diff options
| author | Alexander Volkov <avolkov@astralinux.ru> | 2020-05-20 17:12:14 +0300 |
|---|---|---|
| committer | Alexander Volkov <avolkov@astralinux.ru> | 2020-05-25 08:54:56 +0000 |
| commit | a2f9eaf552b58a258beb25d29691fff97276e198 (patch) | |
| tree | 29b532f84ce4f73168297a8ae5ecb92b8e6231d3 /src/dialogs/Private | |
| parent | 052eb295cd5c0d7aa101e7fe30e53ecf3f894361 (diff) | |
Add missing override
Pick-to: 5.15
Change-Id: Iba896b0af174ed28a27413d7343427cf9b4600d3
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/dialogs/Private')
| -rw-r--r-- | src/dialogs/Private/dialogsprivateplugin.cpp | 2 | ||||
| -rw-r--r-- | src/dialogs/Private/qquickfontlistmodel_p.h | 12 | ||||
| -rw-r--r-- | src/dialogs/Private/qquickwritingsystemlistmodel_p.h | 12 |
3 files changed, 13 insertions, 13 deletions
diff --git a/src/dialogs/Private/dialogsprivateplugin.cpp b/src/dialogs/Private/dialogsprivateplugin.cpp index a785f388e..bee329ee1 100644 --- a/src/dialogs/Private/dialogsprivateplugin.cpp +++ b/src/dialogs/Private/dialogsprivateplugin.cpp @@ -51,7 +51,7 @@ class QtQuick2DialogsPrivatePlugin : public QQmlExtensionPlugin public: QtQuick2DialogsPrivatePlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { } - virtual void registerTypes(const char *uri) + void registerTypes(const char *uri) override { Q_ASSERT(QLatin1String(uri) == QLatin1String("QtQuick.Dialogs.Private")); diff --git a/src/dialogs/Private/qquickfontlistmodel_p.h b/src/dialogs/Private/qquickfontlistmodel_p.h index 73270e12a..5792a658a 100644 --- a/src/dialogs/Private/qquickfontlistmodel_p.h +++ b/src/dialogs/Private/qquickfontlistmodel_p.h @@ -73,10 +73,10 @@ public: FontFamilyRole = Qt::UserRole + 1 }; - virtual int rowCount(const QModelIndex &parent = QModelIndex()) const; - virtual QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const; - virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - virtual QHash<int, QByteArray> roleNames() const; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + QHash<int, QByteArray> roleNames() const override; int count() const { return rowCount(QModelIndex()); } @@ -91,8 +91,8 @@ public: Q_INVOKABLE QJSValue get(int index) const; Q_INVOKABLE QJSValue pointSizes(); - virtual void classBegin(); - virtual void componentComplete(); + void classBegin() override; + void componentComplete() override; public Q_SLOTS: void setScalableFonts(bool arg); diff --git a/src/dialogs/Private/qquickwritingsystemlistmodel_p.h b/src/dialogs/Private/qquickwritingsystemlistmodel_p.h index 8ece6586e..407f84eb0 100644 --- a/src/dialogs/Private/qquickwritingsystemlistmodel_p.h +++ b/src/dialogs/Private/qquickwritingsystemlistmodel_p.h @@ -68,10 +68,10 @@ public: WritingSystemSampleRole = Qt::UserRole + 2 }; - virtual int rowCount(const QModelIndex &parent = QModelIndex()) const; - virtual QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const; - virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - virtual QHash<int, QByteArray> roleNames() const; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + QHash<int, QByteArray> roleNames() const override; int count() const { return rowCount(QModelIndex()); } @@ -79,8 +79,8 @@ public: Q_INVOKABLE QJSValue get(int index) const; - virtual void classBegin(); - virtual void componentComplete(); + void classBegin() override; + void componentComplete() override; Q_SIGNALS: void writingSystemsChanged(); |