diff options
Diffstat (limited to 'tests/auto/widgets/kernel')
10 files changed, 53 insertions, 52 deletions
diff --git a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp index e8fd5b49cd..3cb4c58513 100644 --- a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp +++ b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp @@ -1807,7 +1807,7 @@ class CustomStyle : public QProxyStyle public: CustomStyle() : QProxyStyle("Windows") { Q_ASSERT(!polished); } ~CustomStyle() { polished = 0; } - void polish(QPalette &palette) + void polish(QPalette &palette) override { polished++; palette.setColor(QPalette::Active, QPalette::Link, Qt::red); @@ -1822,7 +1822,7 @@ class CustomStylePlugin : public QStylePlugin Q_OBJECT Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QStyleFactoryInterface" FILE "customstyle.json") public: - QStyle *create(const QString &) { return new CustomStyle; } + QStyle *create(const QString &) override { return new CustomStyle; } }; Q_IMPORT_PLUGIN(CustomStylePlugin) diff --git a/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp b/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp index cbfbefaf3c..00e82248d4 100644 --- a/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp +++ b/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp @@ -71,7 +71,7 @@ public: } virtual int pixelMetric(PixelMetric metric, const QStyleOption * option = 0, - const QWidget * widget = 0 ) const; + const QWidget * widget = 0 ) const override; int hspacing; int vspacing; @@ -245,7 +245,7 @@ public: } virtual QRect subElementRect(SubElement sr, const QStyleOption *opt, - const QWidget *widget) const + const QWidget *widget) const override { QRect rect = opt->rect; switch (sr) { @@ -411,14 +411,14 @@ class LayoutItem : public QLayoutItem public: LayoutItem(const Descr &descr) :m_descr(descr) {} - QSize sizeHint() const { return QSize(m_descr.sizeHint, 100); } - QSize minimumSize() const { return QSize(m_descr.minimumSize, 0); } - QSize maximumSize() const { return QSize(m_descr.maximumSize, QLAYOUTSIZE_MAX); } - Qt::Orientations expandingDirections() const + QSize sizeHint() const override { return QSize(m_descr.sizeHint, 100); } + QSize minimumSize() const override { return QSize(m_descr.minimumSize, 0); } + QSize maximumSize() const override { return QSize(m_descr.maximumSize, QLAYOUTSIZE_MAX); } + Qt::Orientations expandingDirections() const override { return m_descr.expanding ? Qt::Horizontal : Qt::Orientations{}; } - void setGeometry(const QRect &r) { m_pos = r.x(); m_size = r.width();} - QRect geometry() const { return QRect(m_pos, 0, m_size, 100); } - bool isEmpty() const { return m_descr.empty; } + void setGeometry(const QRect &r) override { m_pos = r.x(); m_size = r.width();} + QRect geometry() const override { return QRect(m_pos, 0, m_size, 100); } + bool isEmpty() const override { return m_descr.empty; } private: Descr m_descr; diff --git a/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp b/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp index fd1751c5e7..06e82ecac8 100644 --- a/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp +++ b/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp @@ -298,7 +298,7 @@ public: } virtual int pixelMetric(PixelMetric metric, const QStyleOption * option = 0, - const QWidget * widget = 0 ) const; + const QWidget * widget = 0 ) const override; int hspacing; int vspacing; @@ -391,7 +391,7 @@ void tst_QFormLayout::contentsRect() class DummyMacStyle : public QCommonStyle { public: - virtual int styleHint ( StyleHint hint, const QStyleOption * option = 0, const QWidget * widget = 0, QStyleHintReturn * returnData = 0 ) const + virtual int styleHint ( StyleHint hint, const QStyleOption * option = 0, const QWidget * widget = 0, QStyleHintReturn * returnData = 0 ) const override { switch(hint) { case SH_FormLayoutFormAlignment: @@ -411,7 +411,7 @@ public: class DummyQtopiaStyle : public QCommonStyle { public: - virtual int styleHint ( StyleHint hint, const QStyleOption * option = 0, const QWidget * widget = 0, QStyleHintReturn * returnData = 0 ) const + virtual int styleHint ( StyleHint hint, const QStyleOption * option = 0, const QWidget * widget = 0, QStyleHintReturn * returnData = 0 ) const override { switch(hint) { case SH_FormLayoutFormAlignment: diff --git a/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp index 26dbab5e15..69d85df597 100644 --- a/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp +++ b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp @@ -386,7 +386,7 @@ public: SizeHinter(int w, int h, QWidget *parent = 0) : QWidget(parent), sh(QSize(w,h)) {} void setSizeHint(QSize s) { sh = s; } - QSize sizeHint() const { return sh; } + QSize sizeHint() const override { return sh; } private: QSize sh; }; @@ -452,7 +452,7 @@ public: } virtual int pixelMetric(PixelMetric metric, const QStyleOption * option = nullptr, - const QWidget * widget = nullptr ) const; + const QWidget * widget = nullptr ) const override; int spacing = 6; int margin = 9; @@ -508,11 +508,11 @@ public: } void setSizeHint(const QSize &s) { sh = s; } - QSize sizeHint() const { return sh; } + QSize sizeHint() const override { return sh; } void setMinimumSizeHint(const QSize &s) { msh = s; } - QSize minimumSizeHint() const { return msh; } + QSize minimumSizeHint() const override { return msh; } - virtual int heightForWidth(int width) const; + virtual int heightForWidth(int width) const override; void setNumberOfPixels(int numPixels) { m_numPixels = numPixels; @@ -901,9 +901,9 @@ public: } virtual int pixelMetric(PixelMetric metric, const QStyleOption * option = 0, - const QWidget * widget = 0 ) const; + const QWidget * widget = 0 ) const override; virtual QRect subElementRect(SubElement sr, const QStyleOption *opt, - const QWidget *widget) const; + const QWidget *widget) const override; int hspacing; int vspacing; @@ -913,7 +913,7 @@ public: QSizePolicy::ControlType control2, Qt::Orientation orientation, const QStyleOption *option = 0, - const QWidget *widget = 0) const; + const QWidget *widget = 0) const override; }; diff --git a/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp b/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp index e5e0a48503..dec332196b 100644 --- a/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp +++ b/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp @@ -104,8 +104,8 @@ public: void setSizeHint(const QSize &s) { sh = s; } - QSize sizeHint() const { return sh; } - QSize minimumSizeHint() const { return msh; } + QSize sizeHint() const override { return sh; } + QSize minimumSizeHint() const override { return msh; } private: QSize sh; @@ -221,13 +221,13 @@ class MyLayout : public QLayout { public: MyLayout() : invalidated(false) {} - virtual void invalidate() {invalidated = true;} + virtual void invalidate() override {invalidated = true;} bool invalidated; - QSize sizeHint() const {return QSize();} - void addItem(QLayoutItem*) {} - QLayoutItem* itemAt(int) const {return 0;} - QLayoutItem* takeAt(int) {return 0;} - int count() const {return 0;} + QSize sizeHint() const override {return QSize();} + void addItem(QLayoutItem*) override {} + QLayoutItem* itemAt(int) const override {return 0;} + QLayoutItem* takeAt(int) override {return 0;} + int count() const override {return 0;} }; void tst_QLayout::setContentsMargins() @@ -253,7 +253,7 @@ void tst_QLayout::setContentsMargins() class EventReceiver : public QObject { public: - bool eventFilter(QObject *watched, QEvent *event) + bool eventFilter(QObject *watched, QEvent *event) override { if (event->type() == QEvent::Show) { geom = static_cast<QWidget*>(watched)->geometry(); diff --git a/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp b/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp index 053dc03296..8721a7191a 100644 --- a/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp +++ b/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp @@ -284,13 +284,13 @@ protected: return true; } - void focusInEvent(QFocusEvent *event) + void focusInEvent(QFocusEvent *event) override { QLineEdit::focusInEvent(event); hasFakeEditFocus = isSingleFocusWidget(); } - void focusOutEvent(QFocusEvent *event) + void focusOutEvent(QFocusEvent *event) override { hasFakeEditFocus = false; QLineEdit::focusOutEvent(event); diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp index b3a2323d3e..356b969055 100644 --- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp +++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp @@ -6986,7 +6986,7 @@ public: } protected: - void paintEvent(QPaintEvent *) + void paintEvent(QPaintEvent *) override { if (ellipse) { QPainter painter(this); @@ -10142,7 +10142,7 @@ void tst_QWidget::focusProxy() int focusOutCount = 0; protected: - bool eventFilter(QObject *receiver, QEvent *event) + bool eventFilter(QObject *receiver, QEvent *event) override { if (receiver == edit) { switch (event->type()) { diff --git a/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp b/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp index 890a53541a..17b119410f 100644 --- a/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp +++ b/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp @@ -523,10 +523,10 @@ public: : QWidget(w), m_log(log), m_ignoreDragMove(ignoreDragMove) {} protected: - void dragEnterEvent(QDragEnterEvent *); - void dragMoveEvent(QDragMoveEvent *); - void dragLeaveEvent(QDragLeaveEvent *); - void dropEvent(QDropEvent *); + void dragEnterEvent(QDragEnterEvent *) override; + void dragMoveEvent(QDragMoveEvent *) override; + void dragLeaveEvent(QDragLeaveEvent *) override; + void dropEvent(QDropEvent *) override; private: void formatDropEvent(const char *function, const QDropEvent *e, QTextStream &str) const; @@ -700,7 +700,7 @@ public: DnDEventRecorder() { setAcceptDrops(true); } protected: - void mousePressEvent(QMouseEvent *) + void mousePressEvent(QMouseEvent *) override { QMimeData *mimeData = new QMimeData; mimeData->setData("application/x-dnditemdata", "some data"); @@ -709,23 +709,23 @@ protected: drag->exec(); } - void dragEnterEvent(QDragEnterEvent *e) + void dragEnterEvent(QDragEnterEvent *e) override { e->accept(); _dndEvents.append(QStringLiteral("DragEnter ")); } - void dragMoveEvent(QDragMoveEvent *e) + void dragMoveEvent(QDragMoveEvent *e) override { e->accept(); _dndEvents.append(QStringLiteral("DragMove ")); emit dragMoveReceived(); } - void dragLeaveEvent(QDragLeaveEvent *e) + void dragLeaveEvent(QDragLeaveEvent *e) override { e->accept(); _dndEvents.append(QStringLiteral("DragLeave ")); } - void dropEvent(QDropEvent *e) + void dropEvent(QDropEvent *e) override { e->accept(); _dndEvents.append(QStringLiteral("DropEvent ")); @@ -1055,7 +1055,7 @@ void tst_QWidget_window::tst_showhide_count() return count; } protected: - bool eventFilter(QObject *receiver, QEvent *event) + bool eventFilter(QObject *receiver, QEvent *event) override { if (QWidget *widget = qobject_cast<QWidget*>(receiver)) { const auto entry = Entry(widget, event->type()); @@ -1341,7 +1341,7 @@ void tst_QWidget_window::mouseMoveWithPopup() : QWidget(parent, flags|Qt::CustomizeWindowHint|Qt::FramelessWindowHint) {} - QSize sizeHint() const + QSize sizeHint() const override { if (parent()) return QSize(150, 100); @@ -1360,7 +1360,7 @@ void tst_QWidget_window::mouseMoveWithPopup() mouseReleaseCount = 0; } protected: - void mousePressEvent(QMouseEvent *event) + void mousePressEvent(QMouseEvent *event) override { ++mousePressCount; @@ -1378,12 +1378,12 @@ void tst_QWidget_window::mouseMoveWithPopup() QWidget::mousePressEvent(event); } } - void mouseReleaseEvent(QMouseEvent *event) + void mouseReleaseEvent(QMouseEvent *event) override { ++mouseReleaseCount; QWidget::mouseReleaseEvent(event); } - void mouseMoveEvent(QMouseEvent *event) + void mouseMoveEvent(QMouseEvent *event) override { ++mouseMoveCount; QWidget::mouseMoveEvent(event); diff --git a/tests/auto/widgets/kernel/qwidgetaction/tst_qwidgetaction.cpp b/tests/auto/widgets/kernel/qwidgetaction/tst_qwidgetaction.cpp index 28731223a9..ad91cf3031 100644 --- a/tests/auto/widgets/kernel/qwidgetaction/tst_qwidgetaction.cpp +++ b/tests/auto/widgets/kernel/qwidgetaction/tst_qwidgetaction.cpp @@ -212,7 +212,7 @@ public: QList<QWidget *> createdWidgets() const { return QWidgetAction::createdWidgets(); } protected: - virtual QWidget *createWidget(QWidget *parent); + virtual QWidget *createWidget(QWidget *parent) override; }; QWidget *ComboAction::createWidget(QWidget *parent) @@ -396,7 +396,7 @@ class CrashedAction : public QWidgetAction public: inline CrashedAction(QObject *parent) : QWidgetAction(parent) { } - virtual QWidget *createWidget(QWidget *parent) { + virtual QWidget *createWidget(QWidget *parent) override { return new QWidget(parent); } }; diff --git a/tests/auto/widgets/kernel/qwindowcontainer/tst_qwindowcontainer.cpp b/tests/auto/widgets/kernel/qwindowcontainer/tst_qwindowcontainer.cpp index 2a8edaf1a2..ec646ccbe3 100644 --- a/tests/auto/widgets/kernel/qwindowcontainer/tst_qwindowcontainer.cpp +++ b/tests/auto/widgets/kernel/qwindowcontainer/tst_qwindowcontainer.cpp @@ -49,7 +49,8 @@ public: { } - void exposeEvent(QExposeEvent *) { + void exposeEvent(QExposeEvent *) override + { if (isExposed()) ++numberOfExposes; else |