summaryrefslogtreecommitdiff
path: root/src/widgets
diff options
context:
space:
mode:
authorAlexander Volkov <avolkov@astralinux.ru>2020-05-20 17:12:14 +0300
committerAlexander Volkov <avolkov@astralinux.ru>2020-05-25 08:54:56 +0000
commita2f9eaf552b58a258beb25d29691fff97276e198 (patch)
tree29b532f84ce4f73168297a8ae5ecb92b8e6231d3 /src/widgets
parent052eb295cd5c0d7aa101e7fe30e53ecf3f894361 (diff)
downloadqtquickcontrols-a2f9eaf552b58a258beb25d29691fff97276e198.tar.gz
Add missing override
Pick-to: 5.15 Change-Id: Iba896b0af174ed28a27413d7343427cf9b4600d3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/widgets')
-rw-r--r--src/widgets/qmessageboxhelper_p.h10
-rw-r--r--src/widgets/qquickqcolordialog.cpp10
-rw-r--r--src/widgets/qquickqcolordialog_p.h2
-rw-r--r--src/widgets/qquickqfontdialog.cpp10
-rw-r--r--src/widgets/qquickqfontdialog_p.h2
-rw-r--r--src/widgets/qquickqmessagebox_p.h2
-rw-r--r--src/widgets/widgetsplugin.cpp2
7 files changed, 19 insertions, 19 deletions
diff --git a/src/widgets/qmessageboxhelper_p.h b/src/widgets/qmessageboxhelper_p.h
index cdc4b9e2..5aeb7230 100644
--- a/src/widgets/qmessageboxhelper_p.h
+++ b/src/widgets/qmessageboxhelper_p.h
@@ -61,12 +61,12 @@ class QCloseableMessageBox : public QMessageBox
public:
QCloseableMessageBox(QWidget *parent = 0) : QMessageBox(parent) { }
- void closeEvent(QCloseEvent *e) {
+ void closeEvent(QCloseEvent *e) override {
// QTBUG-36227: Bypass QMessageBox::closeEvent()
QDialog::closeEvent(e);
}
- void keyPressEvent(QKeyEvent *e) {
+ void keyPressEvent(QKeyEvent *e) override {
QMessageBox::keyPressEvent(e);
// QTBUG-36227: reject on escape or cmd-period even if there's no cancel button
if ((isVisible() && e->key() == Qt::Key_Escape)
@@ -88,9 +88,9 @@ public:
connect(&m_dialog, SIGNAL(buttonClicked(QAbstractButton*)), this, SLOT(buttonClicked(QAbstractButton*)));
}
- virtual void exec() { m_dialog.exec(); }
+ void exec() override { m_dialog.exec(); }
- virtual bool show(Qt::WindowFlags f, Qt::WindowModality m, QWindow *parent) {
+ bool show(Qt::WindowFlags f, Qt::WindowModality m, QWindow *parent) override {
m_dialog.winId();
QWindow *window = m_dialog.windowHandle();
Q_ASSERT(window);
@@ -113,7 +113,7 @@ public:
return m_dialog.isVisible();
}
- virtual void hide() { m_dialog.hide(); }
+ void hide() override { m_dialog.hide(); }
QCloseableMessageBox m_dialog;
diff --git a/src/widgets/qquickqcolordialog.cpp b/src/widgets/qquickqcolordialog.cpp
index 609c023f..996c0708 100644
--- a/src/widgets/qquickqcolordialog.cpp
+++ b/src/widgets/qquickqcolordialog.cpp
@@ -60,12 +60,12 @@ public:
connect(&m_dialog, SIGNAL(rejected()), this, SIGNAL(reject()));
}
- virtual void setCurrentColor(const QColor &c) { m_dialog.setCurrentColor(c); }
- virtual QColor currentColor() const { return m_dialog.currentColor(); }
+ void setCurrentColor(const QColor &c) override { m_dialog.setCurrentColor(c); }
+ QColor currentColor() const override { return m_dialog.currentColor(); }
- virtual void exec() { m_dialog.exec(); }
+ void exec() override { m_dialog.exec(); }
- virtual bool show(Qt::WindowFlags f, Qt::WindowModality m, QWindow *parent) {
+ bool show(Qt::WindowFlags f, Qt::WindowModality m, QWindow *parent) override {
m_dialog.winId();
QWindow *window = m_dialog.windowHandle();
Q_ASSERT(window);
@@ -78,7 +78,7 @@ public:
return m_dialog.isVisible();
}
- virtual void hide() { m_dialog.hide(); }
+ void hide() override { m_dialog.hide(); }
private:
QColorDialog m_dialog;
diff --git a/src/widgets/qquickqcolordialog_p.h b/src/widgets/qquickqcolordialog_p.h
index 94804c13..91abf84c 100644
--- a/src/widgets/qquickqcolordialog_p.h
+++ b/src/widgets/qquickqcolordialog_p.h
@@ -64,7 +64,7 @@ public:
virtual ~QQuickQColorDialog();
protected:
- QPlatformColorDialogHelper *helper();
+ QPlatformColorDialogHelper *helper() override;
Q_DISABLE_COPY(QQuickQColorDialog)
};
diff --git a/src/widgets/qquickqfontdialog.cpp b/src/widgets/qquickqfontdialog.cpp
index bc730a94..505fdc8a 100644
--- a/src/widgets/qquickqfontdialog.cpp
+++ b/src/widgets/qquickqfontdialog.cpp
@@ -60,12 +60,12 @@ public:
connect(&m_dialog, SIGNAL(rejected()), this, SIGNAL(reject()));
}
- virtual void setCurrentFont(const QFont &font) { m_dialog.setCurrentFont(font); }
- virtual QFont currentFont() const { return m_dialog.currentFont(); }
+ void setCurrentFont(const QFont &font) override { m_dialog.setCurrentFont(font); }
+ QFont currentFont() const override { return m_dialog.currentFont(); }
- virtual void exec() { m_dialog.exec(); }
+ void exec() override { m_dialog.exec(); }
- virtual bool show(Qt::WindowFlags f, Qt::WindowModality m, QWindow *parent) {
+ bool show(Qt::WindowFlags f, Qt::WindowModality m, QWindow *parent) override {
m_dialog.winId();
QWindow *window = m_dialog.windowHandle();
Q_ASSERT(window);
@@ -80,7 +80,7 @@ public:
return m_dialog.isVisible();
}
- virtual void hide() { m_dialog.hide(); }
+ void hide() override { m_dialog.hide(); }
private:
QFontDialog m_dialog;
diff --git a/src/widgets/qquickqfontdialog_p.h b/src/widgets/qquickqfontdialog_p.h
index a320299d..4d1b336a 100644
--- a/src/widgets/qquickqfontdialog_p.h
+++ b/src/widgets/qquickqfontdialog_p.h
@@ -64,7 +64,7 @@ public:
virtual ~QQuickQFontDialog();
protected:
- QPlatformFontDialogHelper *helper();
+ QPlatformFontDialogHelper *helper() override;
Q_DISABLE_COPY(QQuickQFontDialog)
};
diff --git a/src/widgets/qquickqmessagebox_p.h b/src/widgets/qquickqmessagebox_p.h
index 0972b149..4ff7c0af 100644
--- a/src/widgets/qquickqmessagebox_p.h
+++ b/src/widgets/qquickqmessagebox_p.h
@@ -62,7 +62,7 @@ public:
virtual ~QQuickQMessageBox();
protected:
- virtual QPlatformDialogHelper *helper();
+ QPlatformDialogHelper *helper() override;
protected:
Q_DISABLE_COPY(QQuickQMessageBox)
diff --git a/src/widgets/widgetsplugin.cpp b/src/widgets/widgetsplugin.cpp
index 6617319b..b307c7e9 100644
--- a/src/widgets/widgetsplugin.cpp
+++ b/src/widgets/widgetsplugin.cpp
@@ -81,7 +81,7 @@ class QtQuick2PrivateWidgetsPlugin : public QQmlExtensionPlugin
public:
QtQuick2PrivateWidgetsPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { }
- virtual void registerTypes(const char *uri)
+ void registerTypes(const char *uri) override
{
Q_ASSERT(QLatin1String(uri) == QLatin1String("QtQuick.PrivateWidgets"));
#if QT_CONFIG(messagebox)