summaryrefslogtreecommitdiff
path: root/src/widgets
diff options
context:
space:
mode:
authorKevin Funk <kfunk@kde.org>2017-09-20 20:57:45 +0200
committerKevin Funk <kevin.funk@kdab.com>2017-09-22 07:28:42 +0000
commite95ba2c62d71d6973f8c7ca00028e41395a1cce7 (patch)
tree2c5d9c7a7e59b4d96fe00b5213bd3cfd03872e6d /src/widgets
parent55e133fea09e639b4143b663b79f8ecfaf96d4d6 (diff)
downloadqtquickcontrols-e95ba2c62d71d6973f8c7ca00028e41395a1cce7.tar.gz
Replace Q_DECL_OVERRIDE with override
Change-Id: I39eb6cd5c6be80b14597b666c6fee05978be26ce Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/widgets')
-rw-r--r--src/widgets/qquickqfiledialog_p.h26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/widgets/qquickqfiledialog_p.h b/src/widgets/qquickqfiledialog_p.h
index 9e20ae88..d977e345 100644
--- a/src/widgets/qquickqfiledialog_p.h
+++ b/src/widgets/qquickqfiledialog_p.h
@@ -66,10 +66,10 @@ public:
QQuickQFileDialog(QObject *parent = 0);
virtual ~QQuickQFileDialog();
- virtual QList<QUrl> fileUrls() const Q_DECL_OVERRIDE;
+ QList<QUrl> fileUrls() const override;
protected:
- QPlatformFileDialogHelper *helper() Q_DECL_OVERRIDE;
+ QPlatformFileDialogHelper *helper() override;
Q_DISABLE_COPY(QQuickQFileDialog)
};
@@ -80,17 +80,17 @@ class QFileDialogHelper : public QPlatformFileDialogHelper
public:
QFileDialogHelper();
- bool defaultNameFilterDisables() const Q_DECL_OVERRIDE { return true; }
- void setDirectory(const QUrl &dir) Q_DECL_OVERRIDE { m_dialog.setDirectoryUrl(dir); }
- QUrl directory() const Q_DECL_OVERRIDE { return m_dialog.directoryUrl(); }
- void selectFile(const QUrl &f) Q_DECL_OVERRIDE { m_dialog.selectUrl(f); }
- QList<QUrl> selectedFiles() const Q_DECL_OVERRIDE;
- void setFilter() Q_DECL_OVERRIDE;
- void selectNameFilter(const QString &f) Q_DECL_OVERRIDE { m_dialog.selectNameFilter(f); }
- QString selectedNameFilter() const Q_DECL_OVERRIDE { return m_dialog.selectedNameFilter(); }
- void exec() Q_DECL_OVERRIDE { m_dialog.exec(); }
- bool show(Qt::WindowFlags f, Qt::WindowModality m, QWindow *parent) Q_DECL_OVERRIDE;
- void hide() Q_DECL_OVERRIDE { m_dialog.hide(); }
+ bool defaultNameFilterDisables() const override { return true; }
+ void setDirectory(const QUrl &dir) override { m_dialog.setDirectoryUrl(dir); }
+ QUrl directory() const override { return m_dialog.directoryUrl(); }
+ void selectFile(const QUrl &f) override { m_dialog.selectUrl(f); }
+ QList<QUrl> selectedFiles() const override;
+ void setFilter() override;
+ void selectNameFilter(const QString &f) override { m_dialog.selectNameFilter(f); }
+ QString selectedNameFilter() const override { return m_dialog.selectedNameFilter(); }
+ void exec() override { m_dialog.exec(); }
+ bool show(Qt::WindowFlags f, Qt::WindowModality m, QWindow *parent) override;
+ void hide() override { m_dialog.hide(); }
private Q_SLOTS:
void currentChanged(const QString& path);