diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2015-07-18 22:38:30 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2015-07-19 19:18:02 +0000 |
| commit | 5c9eb4220fc04730266a58e4e65373eca574e170 (patch) | |
| tree | ee8d1639a7dc1ad738c3c27d5631e5c954d8533c | |
| parent | 984b72d31b42f9457e17b7c093b80f88a6ffd29f (diff) | |
| download | qtquickcontrols-5c9eb4220fc04730266a58e4e65373eca574e170.tar.gz | |
Use Q_DECL_OVERRIDE consistently
Change-Id: Ib306f8f647014b399b87ffff13f24277273a6f4f
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
| -rw-r--r-- | src/dialogs/qquickfiledialog_p.h | 4 | ||||
| -rw-r--r-- | src/dialogs/qquickplatformfiledialog_p.h | 2 | ||||
| -rw-r--r-- | src/widgets/qquickqfiledialog_p.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/dialogs/qquickfiledialog_p.h b/src/dialogs/qquickfiledialog_p.h index d7b0804b..1dd65531 100644 --- a/src/dialogs/qquickfiledialog_p.h +++ b/src/dialogs/qquickfiledialog_p.h @@ -65,7 +65,7 @@ class QQuickFileDialog : public QQuickAbstractFileDialog public: explicit QQuickFileDialog(QObject *parent = 0); ~QQuickFileDialog(); - virtual QList<QUrl> fileUrls() const; + virtual QList<QUrl> fileUrls() const Q_DECL_OVERRIDE; QJSValue shortcuts(); QJSValue __shortcuts(); @@ -78,7 +78,7 @@ public Q_SLOTS: bool addSelection(const QUrl &path); protected: - virtual QPlatformFileDialogHelper *helper() { return 0; } + virtual QPlatformFileDialogHelper *helper() Q_DECL_OVERRIDE { return 0; } Q_INVOKABLE QString urlToPath(const QUrl &url) { return url.toLocalFile(); } Q_INVOKABLE QUrl pathToUrl(const QString &path) { return QUrl::fromLocalFile(path); } Q_INVOKABLE QUrl pathFolder(const QString &path); diff --git a/src/dialogs/qquickplatformfiledialog_p.h b/src/dialogs/qquickplatformfiledialog_p.h index 5a5cc75f..4053db56 100644 --- a/src/dialogs/qquickplatformfiledialog_p.h +++ b/src/dialogs/qquickplatformfiledialog_p.h @@ -63,7 +63,7 @@ public: virtual QList<QUrl> fileUrls() const Q_DECL_OVERRIDE; protected: - QPlatformFileDialogHelper *helper(); + QPlatformFileDialogHelper *helper() Q_DECL_OVERRIDE; Q_DISABLE_COPY(QQuickPlatformFileDialog) }; diff --git a/src/widgets/qquickqfiledialog_p.h b/src/widgets/qquickqfiledialog_p.h index 2747749e..7b9e5cbe 100644 --- a/src/widgets/qquickqfiledialog_p.h +++ b/src/widgets/qquickqfiledialog_p.h @@ -64,7 +64,7 @@ public: virtual QList<QUrl> fileUrls() const Q_DECL_OVERRIDE; protected: - QPlatformFileDialogHelper *helper(); + QPlatformFileDialogHelper *helper() Q_DECL_OVERRIDE; Q_DISABLE_COPY(QQuickQFileDialog) }; |