summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp')
-rw-r--r--tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp50
1 files changed, 25 insertions, 25 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;