diff options
Diffstat (limited to 'tests/auto/widgets/widgets')
14 files changed, 81 insertions, 75 deletions
diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp index da010ac357..2ceba99d91 100644 --- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp +++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp @@ -175,26 +175,26 @@ class MyAbstractItemDelegate : public QAbstractItemDelegate { public: MyAbstractItemDelegate() : QAbstractItemDelegate() {}; - void paint(QPainter *, const QStyleOptionViewItem &, const QModelIndex &) const {} - QSize sizeHint(const QStyleOptionViewItem &, const QModelIndex &) const { return QSize(); } + void paint(QPainter *, const QStyleOptionViewItem &, const QModelIndex &) const override {} + QSize sizeHint(const QStyleOptionViewItem &, const QModelIndex &) const override { return QSize(); } }; class MyAbstractItemModel: public QAbstractItemModel { public: MyAbstractItemModel() : QAbstractItemModel() {}; - QModelIndex index(int, int, const QModelIndex &) const { return QModelIndex(); } - QModelIndex parent(const QModelIndex &) const { return QModelIndex(); } - int rowCount(const QModelIndex &) const { return 0; } - int columnCount(const QModelIndex &) const { return 0; } - bool hasChildren(const QModelIndex &) const { return false; } - QVariant data(const QModelIndex &, int) const { return QVariant(); } - bool setData(const QModelIndex &, const QVariant &, int) { return false; } - bool insertRows(int, int, const QModelIndex &) { return false; } - bool insertColumns(int, int, const QModelIndex &) { return false; } + QModelIndex index(int, int, const QModelIndex &) const override { return QModelIndex(); } + QModelIndex parent(const QModelIndex &) const override { return QModelIndex(); } + int rowCount(const QModelIndex &) const override { return 0; } + int columnCount(const QModelIndex &) const override { return 0; } + bool hasChildren(const QModelIndex &) const override { return false; } + QVariant data(const QModelIndex &, int) const override { return QVariant(); } + bool setData(const QModelIndex &, const QVariant &, int) override { return false; } + bool insertRows(int, int, const QModelIndex &) override { return false; } + bool insertColumns(int, int, const QModelIndex &) override { return false; } void setPersistent(const QModelIndex &, const QModelIndex &) {} - bool removeRows (int, int, const QModelIndex &) { return false; } - bool removeColumns(int, int, const QModelIndex &) { return false; } + bool removeRows (int, int, const QModelIndex &) override { return false; } + bool removeColumns(int, int, const QModelIndex &) override { return false; } void reset() {} }; @@ -202,16 +202,16 @@ class MyAbstractItemView : public QAbstractItemView { public: MyAbstractItemView() : QAbstractItemView() {} - QRect visualRect(const QModelIndex &) const { return QRect(); } - void scrollTo(const QModelIndex &, ScrollHint) {} - QModelIndex indexAt(const QPoint &) const { return QModelIndex(); } + QRect visualRect(const QModelIndex &) const override { return QRect(); } + void scrollTo(const QModelIndex &, ScrollHint) override {} + QModelIndex indexAt(const QPoint &) const override { return QModelIndex(); } protected: - QModelIndex moveCursor(CursorAction, Qt::KeyboardModifiers) { return QModelIndex(); } - int horizontalOffset() const { return 0; } - int verticalOffset() const { return 0; } - bool isIndexHidden(const QModelIndex &) const { return false; } - void setSelection(const QRect &, QItemSelectionModel::SelectionFlags) {} - QRegion visualRegionForSelection(const QItemSelection &) const { return QRegion(); } + QModelIndex moveCursor(CursorAction, Qt::KeyboardModifiers) override { return QModelIndex(); } + int horizontalOffset() const override { return 0; } + int verticalOffset() const override { return 0; } + bool isIndexHidden(const QModelIndex &) const override { return false; } + void setSelection(const QRect &, QItemSelectionModel::SelectionFlags) override {} + QRegion visualRegionForSelection(const QItemSelection &) const override { return QRegion(); } }; void tst_QComboBox::initTestCase() @@ -1831,7 +1831,7 @@ public: box->setGeometry(rect()); } - void keyPressEvent(QKeyEvent *e) + void keyPressEvent(QKeyEvent *e) override { received = (e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter); } @@ -2666,13 +2666,13 @@ void tst_QComboBox::task260974_menuItemRectangleForComboBoxPopup() public: TestStyle() : QProxyStyle(QStyleFactory::create("windows")) { } - int styleHint(StyleHint hint, const QStyleOption *option, const QWidget *widget, QStyleHintReturn *ret) const + int styleHint(StyleHint hint, const QStyleOption *option, const QWidget *widget, QStyleHintReturn *ret) const override { if (hint == SH_ComboBox_Popup) return 1; else return QCommonStyle::styleHint(hint, option, widget, ret); } - void drawControl(ControlElement element, const QStyleOption *option, QPainter *, const QWidget *) const + void drawControl(ControlElement element, const QStyleOption *option, QPainter *, const QWidget *) const override { if (element == CE_MenuItem) discoveredRect = option->rect; diff --git a/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp b/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp index 55be152e40..84a4f9e5a0 100644 --- a/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp +++ b/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp @@ -864,18 +864,18 @@ void tst_QDockWidget::task169808_setFloating() class MyWidget : public QWidget { public: - QSize sizeHint() const + QSize sizeHint() const override { const QRect& deskRect = QGuiApplication::primaryScreen()->availableGeometry(); return QSize(qMin(300, deskRect.width() / 2), qMin(300, deskRect.height() / 2)); } - QSize minimumSizeHint() const + QSize minimumSizeHint() const override { return QSize(20,20); } - void paintEvent(QPaintEvent *) + void paintEvent(QPaintEvent *) override { QPainter p(this); p.fillRect(rect(), Qt::red); diff --git a/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp b/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp index cec2da1d57..67813bdeac 100644 --- a/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp +++ b/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp @@ -52,25 +52,25 @@ public: DoubleSpinBox(QWidget *parent = 0) : QDoubleSpinBox(parent) { /*connect(this, SIGNAL(valueChanged(double)), this, SLOT(foo(double)));*/ } - QString textFromValue(double v) const + QString textFromValue(double v) const override { return QDoubleSpinBox::textFromValue(v); } - QValidator::State validate(QString &text, int &pos) const + QValidator::State validate(QString &text, int &pos) const override { return QDoubleSpinBox::validate(text, pos); } - double valueFromText(const QString &text) const + double valueFromText(const QString &text) const override { return QDoubleSpinBox::valueFromText(text); } #if QT_CONFIG(wheelevent) - void wheelEvent(QWheelEvent *event) + void wheelEvent(QWheelEvent *event) override { QDoubleSpinBox::wheelEvent(event); } #endif - void initStyleOption(QStyleOptionSpinBox *option) const + void initStyleOption(QStyleOptionSpinBox *option) const override { QDoubleSpinBox::initStyleOption(option); } @@ -1172,7 +1172,7 @@ void tst_QDoubleSpinBox::taskQTBUG_5008_textFromValueAndValidate() } //we use the French delimiters here - QString textFromValue (double value) const + QString textFromValue (double value) const override { return locale().toString(value); } diff --git a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp index 15890bfd9c..b0fc8a3bfa 100644 --- a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp +++ b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp @@ -65,7 +65,7 @@ public: { m_timerId = startTimer(200); } - void timerEvent(QTimerEvent*) + void timerEvent(QTimerEvent*) override { QCoreApplication::postEvent(m_tb, new QMouseEvent(QEvent::MouseButtonPress, QPoint(6, 7), Qt::LeftButton, {}, {})); QCoreApplication::postEvent(m_tb, new QMouseEvent(QEvent::MouseMove, QPoint(7, 8), Qt::LeftButton, Qt::LeftButton, {})); @@ -89,7 +89,7 @@ public: m_timerId = startTimer(100); } - void timerEvent(QTimerEvent*) + void timerEvent(QTimerEvent*) override { QCoreApplication::postEvent(m_w, new QMouseEvent(QEvent::MouseButtonPress, QPoint(230, 370), Qt::LeftButton, {}, {})); QCoreApplication::postEvent(m_w, new QMouseEvent(QEvent::MouseButtonRelease, QPoint(230, 370), Qt::LeftButton, {}, {})); @@ -1468,7 +1468,7 @@ public: { } - QSize sizeHint() const + QSize sizeHint() const override { return QSize(200, 200); } diff --git a/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp b/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp index 0b6d161890..a18fd0299a 100644 --- a/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp +++ b/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp @@ -705,7 +705,7 @@ public: { } - void paintEvent(QPaintEvent *) + void paintEvent(QPaintEvent *) override { QPainter p(this); text.setText(QStringLiteral("test")); diff --git a/tests/auto/widgets/widgets/qscrollarea/tst_qscrollarea.cpp b/tests/auto/widgets/widgets/qscrollarea/tst_qscrollarea.cpp index 9f08bd337b..c14b3aa9d8 100644 --- a/tests/auto/widgets/widgets/qscrollarea/tst_qscrollarea.cpp +++ b/tests/auto/widgets/widgets/qscrollarea/tst_qscrollarea.cpp @@ -85,7 +85,7 @@ public: setBackgroundRole(QPalette::Dark); } protected: - QVariant inputMethodQuery(Qt::InputMethodQuery query) const + QVariant inputMethodQuery(Qt::InputMethodQuery query) const override { if (query == Qt::ImCursorRectangle) return QRect(width() / 2, height() / 2, 5, 5); @@ -120,7 +120,7 @@ class HFWWidget : public QWidget { public: HFWWidget(); - int heightForWidth(int w) const; + int heightForWidth(int w) const override; }; HFWWidget::HFWWidget() diff --git a/tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp b/tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp index 2452bc34c5..92771db764 100644 --- a/tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp +++ b/tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp @@ -101,8 +101,8 @@ void tst_QScrollBar::task_209492() int scrollCount; MyScrollArea(QWidget *parent = 0) : QScrollArea(parent), scrollCount(0) {} protected: - void paintEvent(QPaintEvent *) { QTest::qSleep(600); } - void scrollContentsBy(int, int) { ++scrollCount; viewport()->update(); } + void paintEvent(QPaintEvent *) override { QTest::qSleep(600); } + void scrollContentsBy(int, int) override { ++scrollCount; viewport()->update(); } }; MyScrollArea scrollArea; diff --git a/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp b/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp index 9f109ab96c..e9c4d3b0d6 100644 --- a/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp +++ b/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp @@ -64,25 +64,25 @@ public: SpinBox(QWidget *parent = 0) : QSpinBox(parent) {} - QString textFromValue(int v) const + QString textFromValue(int v) const override { return QSpinBox::textFromValue(v); } - QValidator::State validate(QString &text, int &pos) const + QValidator::State validate(QString &text, int &pos) const override { return QSpinBox::validate(text, pos); } - int valueFromText(const QString &text) const + int valueFromText(const QString &text) const override { return QSpinBox::valueFromText(text); } #if QT_CONFIG(wheelevent) - void wheelEvent(QWheelEvent *event) + void wheelEvent(QWheelEvent *event) override { QSpinBox::wheelEvent(event); } #endif - void initStyleOption(QStyleOptionSpinBox *option) const + void initStyleOption(QStyleOptionSpinBox *option) const override { QSpinBox::initStyleOption(option); } @@ -510,7 +510,8 @@ class ReadOnlyChangeTracker: public QSpinBox public: ReadOnlyChangeTracker(QWidget *parent = 0) : QSpinBox(parent) {} - void changeEvent(QEvent *ev) { + void changeEvent(QEvent *ev) override + { if (ev->type() == QEvent::ReadOnlyChange) ++readOnlyChangeEventCount; } @@ -1138,7 +1139,7 @@ void tst_QSpinBox::textFromValue() class sizeHint_SpinBox : public QSpinBox { public: - QSize sizeHint() const + QSize sizeHint() const override { ++sizeHintRequests; return QSpinBox::sizeHint(); @@ -1198,7 +1199,7 @@ void tst_QSpinBox::taskQTBUG_5008_textFromValueAndValidate() } //we use the French delimiters here - QString textFromValue (int value) const + QString textFromValue (int value) const override { return locale().toString(value); } diff --git a/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp b/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp index aca795ff61..b63e917e5c 100644 --- a/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp +++ b/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp @@ -952,11 +952,11 @@ class MyTextEdit : public QTextEdit { setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum); } - virtual QSize minimumSizeHint () const + virtual QSize minimumSizeHint () const override { return QSize(200, 200) * m_iFactor; } - virtual QSize sizeHint() const + virtual QSize sizeHint() const override { return QSize(390, 390) * m_iFactor; } diff --git a/tests/auto/widgets/widgets/qstackedwidget/tst_qstackedwidget.cpp b/tests/auto/widgets/widgets/qstackedwidget/tst_qstackedwidget.cpp index 4fd3661fa7..479c8a463d 100644 --- a/tests/auto/widgets/widgets/qstackedwidget/tst_qstackedwidget.cpp +++ b/tests/auto/widgets/widgets/qstackedwidget/tst_qstackedwidget.cpp @@ -128,13 +128,13 @@ public: createWidgets(); } - virtual void showEvent (QShowEvent *) + virtual void showEvent (QShowEvent *) override { if (!m_staticWidgets) createWidgets(); } - virtual void hideEvent (QHideEvent *) + virtual void hideEvent (QHideEvent *) override { if (!m_staticWidgets) destroyWidgets(); diff --git a/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp b/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp index 502535502d..2afbd44c03 100644 --- a/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp +++ b/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp @@ -702,7 +702,7 @@ public: Widget10052(QWidget *parent) : QWidget(parent), moved(false) { } - void moveEvent(QMoveEvent *e) + void moveEvent(QMoveEvent *e) override { moved = e->oldPos() != e->pos(); QWidget::moveEvent(e); diff --git a/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp b/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp index 25f61ec7ac..4bbd44283d 100644 --- a/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp +++ b/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp @@ -60,10 +60,12 @@ class QTabWidgetChild:public QTabWidget { }; protected: - virtual void tabInserted(int /*index */ ) { + virtual void tabInserted(int /*index */ ) override + { tabCount++; }; - virtual void tabRemoved(int /*index */ ) { + virtual void tabRemoved(int /*index */ ) override + { tabCount--; }; int tabCount; @@ -553,7 +555,8 @@ public: PaintCounter() :count(0) { setAttribute(Qt::WA_OpaquePaintEvent); } int count; protected: - void paintEvent(QPaintEvent*) { + void paintEvent(QPaintEvent*) override + { ++count; } }; diff --git a/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp b/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp index 7e99177dec..f562f84037 100644 --- a/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp +++ b/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp @@ -483,7 +483,8 @@ void tst_QTextBrowser::anchorsWithSelfBuiltHtml() class HelpBrowser : public QTextBrowser { public: - virtual QVariant loadResource(int /*type*/, const QUrl &name) { + virtual QVariant loadResource(int /*type*/, const QUrl &name) override + { QString url = name.toString(); if(url == "qhelp://docs/index.html") { return "index"; diff --git a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp index eaa7251684..4054e35e8d 100644 --- a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp +++ b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp @@ -334,18 +334,18 @@ public: inline QtTestDocumentLayout(QTextEdit *edit, QTextDocument *doc, int &itCount) : QAbstractTextDocumentLayout(doc), useBiggerSize(false), ed(edit), iterationCounter(itCount) {} - virtual void draw(QPainter *, const QAbstractTextDocumentLayout::PaintContext &) {} + virtual void draw(QPainter *, const QAbstractTextDocumentLayout::PaintContext &) override {} - virtual int hitTest(const QPointF &, Qt::HitTestAccuracy ) const { return 0; } + virtual int hitTest(const QPointF &, Qt::HitTestAccuracy ) const override { return 0; } - virtual void documentChanged(int, int, int) {} + virtual void documentChanged(int, int, int) override {} - virtual int pageCount() const { return 1; } + virtual int pageCount() const override { return 1; } - virtual QSizeF documentSize() const { return usedSize; } + virtual QSizeF documentSize() const override { return usedSize; } - virtual QRectF frameBoundingRect(QTextFrame *) const { return QRectF(); } - virtual QRectF blockBoundingRect(const QTextBlock &) const { return QRectF(); } + virtual QRectF frameBoundingRect(QTextFrame *) const override { return QRectF(); } + virtual QRectF blockBoundingRect(const QTextBlock &) const override { return QRectF(); } bool useBiggerSize; QSize usedSize; @@ -1444,15 +1444,15 @@ public: mutable int canInsertCallCount; mutable int insertCallCount; - virtual QMimeData *createMimeDataFromSelection() const { + virtual QMimeData *createMimeDataFromSelection() const override { createMimeDataCallCount++; return QTextEdit::createMimeDataFromSelection(); } - virtual bool canInsertFromMimeData(const QMimeData *source) const { + virtual bool canInsertFromMimeData(const QMimeData *source) const override { canInsertCallCount++; return QTextEdit::canInsertFromMimeData(source); } - virtual void insertFromMimeData(const QMimeData *source) { + virtual void insertFromMimeData(const QMimeData *source) override { insertCallCount++; QTextEdit::insertFromMimeData(source); } @@ -1604,7 +1604,7 @@ public: bool resizeEventCalled; protected: - virtual void resizeEvent(QResizeEvent *e) + virtual void resizeEvent(QResizeEvent *e) override { QTextEdit::resizeEvent(e); setHtml("<img src=qtextbrowser-resizeevent.png width=" + QString::number(size().width()) + "><br>Size is " + QString::number(size().width()) + " x " + QString::number(size().height())); @@ -2005,7 +2005,8 @@ void tst_QTextEdit::fullWidthSelection() // enable full-width-selection for our test widget. class FullWidthStyle : public QCommonStyle { - int styleHint(StyleHint stylehint, const QStyleOption *opt, const QWidget *widget, QStyleHintReturn *returnData) const { + int styleHint(StyleHint stylehint, const QStyleOption *opt, const QWidget *widget, QStyleHintReturn *returnData) const override + { if (stylehint == QStyle::SH_RichText_FullWidthSelection) return 1; return QCommonStyle::styleHint(stylehint, opt, widget, returnData); @@ -2565,7 +2566,7 @@ void tst_QTextEdit::highlightLongLine() class NumHighlighter : public QSyntaxHighlighter { public: explicit NumHighlighter(QTextDocument*doc) : QSyntaxHighlighter(doc) {}; - virtual void highlightBlock(const QString& text) { + virtual void highlightBlock(const QString& text) override { // odd number in bold QTextCharFormat format; format.setFontWeight(QFont::Bold); @@ -2644,7 +2645,7 @@ public: TextEdit(QWidget *parent = 0) : QTextEdit(parent) {} - void wheelEvent(QWheelEvent *event) + void wheelEvent(QWheelEvent *event) override { QTextEdit::wheelEvent(event); } @@ -2703,12 +2704,12 @@ namespace { } - QPaintEngine *paintEngine () const + QPaintEngine *paintEngine () const override { return m_paintEngine; } - int metric (QPaintDevice::PaintDeviceMetric metric) const { + int metric (QPaintDevice::PaintDeviceMetric metric) const override { switch (metric) { case QPaintDevice::PdmWidth: case QPaintDevice::PdmHeight: |