From a2f9eaf552b58a258beb25d29691fff97276e198 Mon Sep 17 00:00:00 2001 From: Alexander Volkov Date: Wed, 20 May 2020 17:12:14 +0300 Subject: Add missing override Pick-to: 5.15 Change-Id: Iba896b0af174ed28a27413d7343427cf9b4600d3 Reviewed-by: Mitch Curtis --- src/widgets/qquickqcolordialog.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/widgets/qquickqcolordialog.cpp') 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; -- cgit v1.2.1