1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compiler warnings about missing overrides

Browse Source 
Change-Id: I52bf9fe45607f4a99cafa441bd78dfe5f7adb0e1
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Lars Knoll 2020-09-11 13:05:27 +02:00
parent 6a37ca39ec
commit 2c698a6d07
23 changed files with 154 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/corelib/io/qsettings/tst_qsettings.cpp
View File

@ -2030,7 +2030,7 @@ int numThreadSafetyFailures;
class SettingsThread : public QThread class SettingsThread : public QThread
{ {
public: public:
void run(); void run() override;
void start(int n) { param = n; QThread::start(); } void start(int n) { param = n; QThread::start(); }
private: private:

2
tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp
View File

@ -2155,7 +2155,7 @@ void tst_QDataStream::stream_atEnd()
class FakeBuffer : public QBuffer class FakeBuffer : public QBuffer
{ {
protected: protected:
qint64 writeData(const char *c, qint64 i) { return m_lock ? 0 : QBuffer::writeData(c, i); } qint64 writeData(const char *c, qint64 i) override { return m_lock ? 0 : QBuffer::writeData(c, i); }
public: public:
FakeBuffer(bool locked = false) : m_lock(locked) {} FakeBuffer(bool locked = false) : m_lock(locked) {}
void setLocked(bool locked) { m_lock = locked; } void setLocked(bool locked) { m_lock = locked; }

2
tests/auto/gui/kernel/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.cpp
View File

@ -35,7 +35,7 @@ struct MyApplication : public QGuiApplication
: QGuiApplication(argc, argv) : QGuiApplication(argc, argv)
{} {}
bool event(QEvent * event) bool event(QEvent * event) override
{ {
if (event->type() == QEvent::FileOpen) { if (event->type() == QEvent::FileOpen) {
QFileOpenEvent* ev = static_cast<QFileOpenEvent *>(event); QFileOpenEvent* ev = static_cast<QFileOpenEvent *>(event);

2
tests/auto/network/socket/qudpsocket/clientserver/main.cpp
View File

@ -70,7 +70,7 @@ public:
} }
protected: protected:
void timerEvent(QTimerEvent *event) void timerEvent(QTimerEvent *event) override
{ {
static int n = 0; static int n = 0;
switch (type) { switch (type) {

42
tests/auto/other/gestures/tst_gestures.cpp
View File

@ -98,12 +98,12 @@ public:
CustomEvent::EventType = QEvent::registerEventType(); CustomEvent::EventType = QEvent::registerEventType();
} }
QGesture* create(QObject *) QGesture* create(QObject *) override
{ {
return new CustomGesture; return new CustomGesture;
} }
QGestureRecognizer::Result recognize(QGesture *state, QObject*, QEvent *event) QGestureRecognizer::Result recognize(QGesture *state, QObject*, QEvent *event) override
{ {
if (event->type() == CustomEvent::EventType) { if (event->type() == CustomEvent::EventType) {
QGestureRecognizer::Result result; QGestureRecognizer::Result result;
@ -127,7 +127,7 @@ public:
return QGestureRecognizer::Ignore; return QGestureRecognizer::Ignore;
} }
void reset(QGesture *state) void reset(QGesture *state) override
{ {
CustomGesture *g = static_cast<CustomGesture *>(state); CustomGesture *g = static_cast<CustomGesture *>(state);
g->serial = 0; g->serial = 0;
@ -146,12 +146,12 @@ public:
CustomEvent::EventType = QEvent::registerEventType(); CustomEvent::EventType = QEvent::registerEventType();
} }
QGesture* create(QObject *) QGesture* create(QObject *) override
{ {
return new CustomGesture; return new CustomGesture;
} }
QGestureRecognizer::Result recognize(QGesture *state, QObject*, QEvent *event) QGestureRecognizer::Result recognize(QGesture *state, QObject*, QEvent *event) override
{ {
if (event->type() == CustomEvent::EventType) { if (event->type() == CustomEvent::EventType) {
QGestureRecognizer::Result result = QGestureRecognizer::ConsumeEventHint; QGestureRecognizer::Result result = QGestureRecognizer::ConsumeEventHint;
@ -171,7 +171,7 @@ public:
return QGestureRecognizer::Ignore; return QGestureRecognizer::Ignore;
} }
void reset(QGesture *state) void reset(QGesture *state) override
{ {
CustomGesture *g = static_cast<CustomGesture *>(state); CustomGesture *g = static_cast<CustomGesture *>(state);
g->serial = 0; g->serial = 0;
@ -226,7 +226,7 @@ public:
QSet<Qt::GestureType> ignoredGestures; QSet<Qt::GestureType> ignoredGestures;
protected: protected:
bool event(QEvent *event) bool event(QEvent *event) override
{ {
Events *eventsPtr = 0; Events *eventsPtr = 0;
if (event->type() == QEvent::Gesture) { if (event->type() == QEvent::Gesture) {
@ -720,17 +720,17 @@ public:
ignoredFinishedGestures.clear(); ignoredFinishedGestures.clear();
} }
QRectF boundingRect() const QRectF boundingRect() const override
{ {
return size; return size;
} }
void paint(QPainter *p, const QStyleOptionGraphicsItem *, QWidget *) void paint(QPainter *p, const QStyleOptionGraphicsItem *, QWidget *) override
{ {
QColor color = InstanceColors[instanceNumber % (sizeof(InstanceColors)/sizeof(InstanceColors[0]))]; QColor color = InstanceColors[instanceNumber % (sizeof(InstanceColors)/sizeof(InstanceColors[0]))];
p->fillRect(boundingRect(), color); p->fillRect(boundingRect(), color);
} }
bool event(QEvent *event) bool event(QEvent *event) override
{ {
Events *eventsPtr = 0; Events *eventsPtr = 0;
if (event->type() == QEvent::Gesture) { if (event->type() == QEvent::Gesture) {
@ -1483,7 +1483,7 @@ void tst_Gestures::autoCancelGestures()
public: public:
MockWidget(const char *name) : GestureWidget(name), badGestureEvents(0) { } MockWidget(const char *name) : GestureWidget(name), badGestureEvents(0) { }
bool event(QEvent *event) bool event(QEvent *event) override
{ {
if (event->type() == QEvent::Gesture) { if (event->type() == QEvent::Gesture) {
QGestureEvent *ge = static_cast<QGestureEvent*>(event); QGestureEvent *ge = static_cast<QGestureEvent*>(event);
@ -1538,7 +1538,8 @@ void tst_Gestures::autoCancelGestures2()
public: public:
MockItem(const char *name) : GestureItem(name), badGestureEvents(0) { } MockItem(const char *name) : GestureItem(name), badGestureEvents(0) { }
bool event(QEvent *event) { bool event(QEvent *event) override
{
if (event->type() == QEvent::Gesture) { if (event->type() == QEvent::Gesture) {
QGestureEvent *ge = static_cast<QGestureEvent*>(event); QGestureEvent *ge = static_cast<QGestureEvent*>(event);
if (ge->gestures().count() != 1) if (ge->gestures().count() != 1)
@ -2029,7 +2030,8 @@ public:
enum PanType { Platform, Default, Custom }; enum PanType { Platform, Default, Custom };
PanRecognizer(int id) : m_id(id) {} PanRecognizer(int id) : m_id(id) {}
QGesture *create(QObject *) { QGesture *create(QObject *) override
{
switch(m_id) { switch(m_id) {
case Platform: return new WinNativePan(); case Platform: return new WinNativePan();
case Default: return new Pan(); case Default: return new Pan();
@ -2037,7 +2039,7 @@ public:
} }
} }
Result recognize(QGesture *, QObject *, QEvent *) { return QGestureRecognizer::Ignore; } Result recognize(QGesture *, QObject *, QEvent *) override { return QGestureRecognizer::Ignore; }
const int m_id; const int m_id;
}; };
@ -2087,12 +2089,14 @@ public:
ReuseCanceledGesturesRecognizer(Type type) : m_type(type) {} ReuseCanceledGesturesRecognizer(Type type) : m_type(type) {}
QGesture *create(QObject *) { QGesture *create(QObject *) override
{
QGesture *g = new QGesture; QGesture *g = new QGesture;
return g; return g;
} }
Result recognize(QGesture *gesture, QObject *, QEvent *event) { Result recognize(QGesture *gesture, QObject *, QEvent *event) override
{
QMouseEvent *me = static_cast<QMouseEvent *>(event); QMouseEvent *me = static_cast<QMouseEvent *>(event);
Qt::MouseButton mouseButton(m_type == LmbType ? Qt::LeftButton : Qt::RightButton); Qt::MouseButton mouseButton(m_type == LmbType ? Qt::LeftButton : Qt::RightButton);
@ -2127,7 +2131,8 @@ class ReuseCanceledGesturesWidget : public QGraphicsWidget
{ {
} }
bool event(QEvent *event) { bool event(QEvent *event) override
{
if (event->type() == QEvent::Gesture) { if (event->type() == QEvent::Gesture) {
QGesture *gesture = static_cast<QGestureEvent*>(event)->gesture(m_gestureType); QGesture *gesture = static_cast<QGestureEvent*>(event)->gesture(m_gestureType);
if (gesture) { if (gesture) {
@ -2310,7 +2315,8 @@ class NoConsumeWidgetBug13501 :public QWidget
{ {
Q_OBJECT Q_OBJECT
protected: protected:
bool event(QEvent *e) { bool event(QEvent *e) override
{
if(e->type() == QEvent::Gesture) { if(e->type() == QEvent::Gesture) {
return false; return false;
} }

4
tests/auto/other/languagechange/tst_languagechange.cpp
View File

@ -84,7 +84,7 @@ public:
TransformTranslator() : QTranslator() {} TransformTranslator() : QTranslator() {}
TransformTranslator(QObject *parent) : QTranslator(parent) {} TransformTranslator(QObject *parent) : QTranslator(parent) {}
QString translate(const char *context, const char *sourceText, QString translate(const char *context, const char *sourceText,
const char *disambiguation = 0, int = -1) const const char *disambiguation = 0, int = -1) const override
{ {
QByteArray total(context); QByteArray total(context);
total.append("::"); total.append("::");
@ -108,7 +108,7 @@ public:
return res; return res;
} }
virtual bool isEmpty() const { return false; } virtual bool isEmpty() const override { return false; }
public: public:
mutable QSet<QByteArray> m_translations; mutable QSet<QByteArray> m_translations;

6
tests/auto/other/qfocusevent/tst_qfocusevent.cpp
View File

@ -54,19 +54,19 @@ public:
bool focusOutEventRecieved; bool focusOutEventRecieved;
bool focusOutEventLostFocus; bool focusOutEventLostFocus;
protected: protected:
virtual void keyPressEvent( QKeyEvent *e ) virtual void keyPressEvent( QKeyEvent *e ) override
{ {
// qDebug( QString("keyPressEvent: %1").arg(e->key()) ); // qDebug( QString("keyPressEvent: %1").arg(e->key()) );
QLineEdit::keyPressEvent( e ); QLineEdit::keyPressEvent( e );
} }
void focusInEvent( QFocusEvent* e ) void focusInEvent( QFocusEvent* e ) override
{ {
QLineEdit::focusInEvent( e ); QLineEdit::focusInEvent( e );
focusInEventReason = e->reason(); focusInEventReason = e->reason();
focusInEventGotFocus = e->gotFocus(); focusInEventGotFocus = e->gotFocus();
focusInEventRecieved = true; focusInEventRecieved = true;
} }
void focusOutEvent( QFocusEvent* e ) void focusOutEvent( QFocusEvent* e ) override
{ {
QLineEdit::focusOutEvent( e ); QLineEdit::focusOutEvent( e );
focusOutEventReason = e->reason(); focusOutEventReason = e->reason();

2
tests/auto/printsupport/dialogs/qabstractprintdialog/tst_qabstractprintdialog.cpp
View File

@ -67,7 +67,7 @@ public:
: QPrintDialog(p) : QPrintDialog(p)
{ {
} }
int exec() { return 0; } int exec() override { return 0; }
void resetAllOptions() void resetAllOptions()
{ {

76
tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
View File

@ -113,7 +113,7 @@ public:
void reset() { _count = 0; } void reset() { _count = 0; }
protected: protected:
bool eventFilter(QObject *watched, QEvent *event) bool eventFilter(QObject *watched, QEvent *event) override
{ {
Q_UNUSED(watched); Q_UNUSED(watched);
if (event->type() == spied) if (event->type() == spied)
@ -315,13 +315,13 @@ void tst_QGraphicsView::construction()
class TestItem : public QGraphicsItem class TestItem : public QGraphicsItem
{ {
public: public:
QRectF boundingRect() const QRectF boundingRect() const override
{ return QRectF(-10, -10, 20, 20); } { return QRectF(-10, -10, 20, 20); }
void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) override
{ hints = painter->renderHints(); painter->drawRect(boundingRect()); } { hints = painter->renderHints(); painter->drawRect(boundingRect()); }
bool sceneEvent(QEvent *event) bool sceneEvent(QEvent *event) override
{ {
events << event->type(); events << event->type();
return QGraphicsItem::sceneEvent(event); return QGraphicsItem::sceneEvent(event);
@ -1593,7 +1593,7 @@ public:
: QGraphicsRectItem(rect), numPaints(0) : QGraphicsRectItem(rect), numPaints(0)
{ } { }
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) override
{ {
++numPaints; ++numPaints;
QGraphicsRectItem::paint(painter, option, widget); QGraphicsRectItem::paint(painter, option, widget);
@ -2188,7 +2188,7 @@ class MouseWheelScene : public QGraphicsScene
public: public:
Qt::Orientation orientation; Qt::Orientation orientation;
void wheelEvent(QGraphicsSceneWheelEvent *event) void wheelEvent(QGraphicsSceneWheelEvent *event) override
{ {
orientation = event->orientation(); orientation = event->orientation();
QGraphicsScene::wheelEvent(event); QGraphicsScene::wheelEvent(event);
@ -2429,7 +2429,7 @@ public:
bool painted; bool painted;
protected: protected:
void paintEvent(QPaintEvent *event) void paintEvent(QPaintEvent *event) override
{ {
lastUpdateRegions << event->region(); lastUpdateRegions << event->region();
painted = true; painted = true;
@ -2634,7 +2634,7 @@ public:
using QGraphicsRectItem::QGraphicsRectItem; using QGraphicsRectItem::QGraphicsRectItem;
bool dirtyPainter = false; bool dirtyPainter = false;
bool receivedPaintEvent = false; bool receivedPaintEvent = false;
void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *w) void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *w) override
{ {
receivedPaintEvent = true; receivedPaintEvent = true;
dirtyPainter = (painter->pen().color() != w->palette().color(w->foregroundRole())); dirtyPainter = (painter->pen().color() != w->palette().color(w->foregroundRole()));
@ -2648,12 +2648,14 @@ public:
MyGraphicsView(QGraphicsScene * scene) : QGraphicsView(scene) MyGraphicsView(QGraphicsScene * scene) : QGraphicsView(scene)
{ } { }
void drawBackground(QPainter * painter, const QRectF & rect) { void drawBackground(QPainter * painter, const QRectF & rect) override
{
painter->setCompositionMode(QPainter::CompositionMode_Source); painter->setCompositionMode(QPainter::CompositionMode_Source);
painter->drawRect(rect); painter->drawRect(rect);
} }
void drawItems (QPainter * painter, int numItems, QGraphicsItem *items[], const QStyleOptionGraphicsItem options[]) { void drawItems (QPainter * painter, int numItems, QGraphicsItem *items[], const QStyleOptionGraphicsItem options[]) override
{
if (!(optimizationFlags() & QGraphicsView::DontSavePainterState)) if (!(optimizationFlags() & QGraphicsView::DontSavePainterState))
QCOMPARE(painter->compositionMode(),QPainter::CompositionMode_SourceOver); QCOMPARE(painter->compositionMode(),QPainter::CompositionMode_SourceOver);
else else
@ -2721,10 +2723,10 @@ void tst_QGraphicsView::optimizationFlags_dontSavePainterState2()
class MyScene : public QGraphicsScene class MyScene : public QGraphicsScene
{ {
public: public:
void drawBackground(QPainter *p, const QRectF &) void drawBackground(QPainter *p, const QRectF &) override
{ transformInDrawBackground = p->worldTransform(); opacityInDrawBackground = p->opacity(); } { transformInDrawBackground = p->worldTransform(); opacityInDrawBackground = p->opacity(); }
void drawForeground(QPainter *p, const QRectF &) void drawForeground(QPainter *p, const QRectF &) override
{ transformInDrawForeground = p->worldTransform(); opacityInDrawForeground = p->opacity(); } { transformInDrawForeground = p->worldTransform(); opacityInDrawForeground = p->opacity(); }
QTransform transformInDrawBackground; QTransform transformInDrawBackground;
@ -2800,7 +2802,7 @@ public:
LodItem(const QRectF &rect) : QGraphicsRectItem(rect), lastLod(-42) LodItem(const QRectF &rect) : QGraphicsRectItem(rect), lastLod(-42)
{ } { }
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *viewport) void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *viewport) override
{ {
lastLod = option->levelOfDetailFromTransform(painter->worldTransform()); lastLod = option->levelOfDetailFromTransform(painter->worldTransform());
QGraphicsRectItem::paint(painter, option, viewport); QGraphicsRectItem::paint(painter, option, viewport);
@ -2863,14 +2865,15 @@ void tst_QGraphicsView::scrollBarRanges_data()
// Simulates motif scrollbar for range tests // Simulates motif scrollbar for range tests
class FauxMotifStyle : public QCommonStyle { class FauxMotifStyle : public QCommonStyle {
public: public:
int styleHint(StyleHint hint, const QStyleOption *option, int styleHint(StyleHint hint, const QStyleOption *option, const QWidget *widget, QStyleHintReturn *returnData) const override
const QWidget *widget, QStyleHintReturn *returnData) const { {
if (hint == QStyle::SH_ScrollView_FrameOnlyAroundContents) if (hint == QStyle::SH_ScrollView_FrameOnlyAroundContents)
return true; return true;
return QCommonStyle::styleHint(hint, option, widget, returnData); return QCommonStyle::styleHint(hint, option, widget, returnData);
} }
int pixelMetric(PixelMetric m, const QStyleOption *opt, const QWidget *widget) const { int pixelMetric(PixelMetric m, const QStyleOption *opt, const QWidget *widget) const override
{
if (m == QStyle::PM_ScrollView_ScrollBarSpacing) if (m == QStyle::PM_ScrollView_ScrollBarSpacing)
return 4; return 4;
return QCommonStyle::pixelMetric(m, opt, widget); return QCommonStyle::pixelMetric(m, opt, widget);
@ -2959,12 +2962,12 @@ public:
bool doubleClickAccepted; bool doubleClickAccepted;
protected: protected:
void mousePressEvent(QMouseEvent *event) void mousePressEvent(QMouseEvent *event) override
{ {
QGraphicsView::mousePressEvent(event); QGraphicsView::mousePressEvent(event);
pressAccepted = event->isAccepted(); pressAccepted = event->isAccepted();
} }
void mouseDoubleClickEvent(QMouseEvent *event) void mouseDoubleClickEvent(QMouseEvent *event) override
{ {
QGraphicsView::mouseDoubleClickEvent(event); QGraphicsView::mouseDoubleClickEvent(event);
doubleClickAccepted = event->isAccepted(); doubleClickAccepted = event->isAccepted();
@ -3020,12 +3023,12 @@ public:
bool doubleClickForwarded; bool doubleClickForwarded;
protected: protected:
void mousePressEvent(QMouseEvent *event) void mousePressEvent(QMouseEvent *event) override
{ {
QWidget::mousePressEvent(event); QWidget::mousePressEvent(event);
pressForwarded = true; pressForwarded = true;
} }
void mouseDoubleClickEvent(QMouseEvent *event) void mouseDoubleClickEvent(QMouseEvent *event) override
{ {
QWidget::mouseDoubleClickEvent(event); QWidget::mouseDoubleClickEvent(event);
doubleClickForwarded = true; doubleClickForwarded = true;
@ -3152,7 +3155,7 @@ public:
QGraphicsTextItem_task172231(const QString & text, QGraphicsItem * parent = 0) QGraphicsTextItem_task172231(const QString & text, QGraphicsItem * parent = 0)
: QGraphicsTextItem(text, parent) {} : QGraphicsTextItem(text, parent) {}
QRectF exposedRect; QRectF exposedRect;
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override
{ {
exposedRect = option->exposedRect; exposedRect = option->exposedRect;
QGraphicsTextItem::paint(painter, option, widget); QGraphicsTextItem::paint(painter, option, widget);
@ -3202,9 +3205,9 @@ public:
int releases; int releases;
protected: protected:
void mousePressEvent(QGraphicsSceneMouseEvent *event) void mousePressEvent(QGraphicsSceneMouseEvent *event) override
{ ++presses; QGraphicsScene::mousePressEvent(event); } { ++presses; QGraphicsScene::mousePressEvent(event); }
void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override
{ ++releases; QGraphicsScene::mouseReleaseEvent(event); } { ++releases; QGraphicsScene::mouseReleaseEvent(event); }
}; };
@ -3257,7 +3260,7 @@ public:
{ } { }
int mouseMoves; int mouseMoves;
protected: protected:
void mouseMoveEvent(QMouseEvent *event) void mouseMoveEvent(QMouseEvent *event) override
{ {
++mouseMoves; ++mouseMoves;
QGraphicsView::mouseMoveEvent(event); QGraphicsView::mouseMoveEvent(event);
@ -3310,7 +3313,7 @@ void tst_QGraphicsView::task207546_focusCrash()
class _Widget : public QWidget class _Widget : public QWidget
{ {
public: public:
bool focusNextPrevChild(bool next) { return QWidget::focusNextPrevChild(next); } bool focusNextPrevChild(bool next) override { return QWidget::focusNextPrevChild(next); }
} widget; } widget;
widget.setLayout(new QVBoxLayout()); widget.setLayout(new QVBoxLayout());
@ -3487,7 +3490,7 @@ public:
{ {
} }
void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) override
{ {
transform = painter->transform(); transform = painter->transform();
} }
@ -3612,7 +3615,7 @@ void tst_QGraphicsView::moveItemWhileScrolling()
} }
protected: protected:
QEventLoop eventLoop; QEventLoop eventLoop;
void paintEvent(QPaintEvent *event) void paintEvent(QPaintEvent *event) override
{ {
painted = true; painted = true;
lastPaintedRegion = event->region(); lastPaintedRegion = event->region();
@ -3918,8 +3921,7 @@ public:
: QGraphicsRectItem(rect), paints(0) : QGraphicsRectItem(rect), paints(0)
{ } { }
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override
QWidget *widget)
{ {
QGraphicsRectItem::paint(painter, option, widget); QGraphicsRectItem::paint(painter, option, widget);
++paints; ++paints;
@ -4306,7 +4308,7 @@ public:
m_viewHasIMEnabledInFocusInEvent = false; m_viewHasIMEnabledInFocusInEvent = false;
} }
void focusInEvent(QFocusEvent * /* event */) void focusInEvent(QFocusEvent * /* event */) override
{ {
QGraphicsView *view = scene()->views().first(); QGraphicsView *view = scene()->views().first();
m_viewHasIMEnabledInFocusInEvent = view->testAttribute(Qt::WA_InputMethodEnabled); m_viewHasIMEnabledInFocusInEvent = view->testAttribute(Qt::WA_InputMethodEnabled);
@ -4470,7 +4472,7 @@ void tst_QGraphicsView::indirectPainting()
class MyScene : public QGraphicsScene class MyScene : public QGraphicsScene
{ public: { public:
MyScene() : QGraphicsScene(), drawCount(0) {} MyScene() : QGraphicsScene(), drawCount(0) {}
void drawItems(QPainter *, int, QGraphicsItem **, const QStyleOptionGraphicsItem *, QWidget *) void drawItems(QPainter *, int, QGraphicsItem **, const QStyleOptionGraphicsItem *, QWidget *) override
{ ++drawCount; } { ++drawCount; }
int drawCount; int drawCount;
}; };
@ -4498,7 +4500,7 @@ void tst_QGraphicsView::compositionModeInDrawBackground()
painted(false), compositionMode(QPainter::CompositionMode_SourceOver) {} painted(false), compositionMode(QPainter::CompositionMode_SourceOver) {}
bool painted; bool painted;
QPainter::CompositionMode compositionMode; QPainter::CompositionMode compositionMode;
void drawBackground(QPainter *painter, const QRectF &) void drawBackground(QPainter *painter, const QRectF &) override
{ {
compositionMode = painter->compositionMode(); compositionMode = painter->compositionMode();
painted = true; painted = true;
@ -4624,7 +4626,7 @@ void tst_QGraphicsView::task259503_scrollingArtifacts()
QRegion updateRegion; QRegion updateRegion;
bool itSTimeToTest; bool itSTimeToTest;
void paintEvent(QPaintEvent *event) void paintEvent(QPaintEvent *event) override
{ {
QGraphicsView::paintEvent(event); QGraphicsView::paintEvent(event);
@ -4713,7 +4715,7 @@ void tst_QGraphicsView::QTBUG_5859_exposedRect()
{ {
public: public:
CustomScene(const QRectF &rect) : QGraphicsScene(rect) { } CustomScene(const QRectF &rect) : QGraphicsScene(rect) { }
void drawBackground(QPainter * /* painter */, const QRectF &rect) void drawBackground(QPainter * /* painter */, const QRectF &rect) override
{ lastBackgroundExposedRect = rect; } { lastBackgroundExposedRect = rect; }
QRectF lastBackgroundExposedRect; QRectF lastBackgroundExposedRect;
}; };
@ -4723,7 +4725,7 @@ void tst_QGraphicsView::QTBUG_5859_exposedRect()
public: public:
CustomRectItem(const QRectF &rect) : QGraphicsRectItem(rect) CustomRectItem(const QRectF &rect) : QGraphicsRectItem(rect)
{ setFlag(QGraphicsItem::ItemUsesExtendedStyleOption); } { setFlag(QGraphicsItem::ItemUsesExtendedStyleOption); }
void paint(QPainter * /* painter */, const QStyleOptionGraphicsItem *option, QWidget * /* widget */ = 0) void paint(QPainter * /* painter */, const QStyleOptionGraphicsItem *option, QWidget * /* widget */ = 0) override
{ lastExposedRect = option->exposedRect; } { lastExposedRect = option->exposedRect; }
QRectF lastExposedRect; QRectF lastExposedRect;
}; };
@ -4778,7 +4780,7 @@ public:
setAcceptHoverEvents(true); setAcceptHoverEvents(true);
} }
bool sceneEvent(QEvent *event) bool sceneEvent(QEvent *event) override
{ {
if (!checkEvents) // ensures that we don't look at stray events before we are ready if (!checkEvents) // ensures that we don't look at stray events before we are ready
return QGraphicsRectItem::sceneEvent(event); return QGraphicsRectItem::sceneEvent(event);
@ -4840,7 +4842,7 @@ public:
setFlag(QGraphicsItem::ItemAcceptsInputMethod, true); setFlag(QGraphicsItem::ItemAcceptsInputMethod, true);
} }
QVariant inputMethodQuery(Qt::InputMethodQuery) const QVariant inputMethodQuery(Qt::InputMethodQuery) const override
{ {
return mf; return mf;
} }

50
tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
View File

@ -175,26 +175,26 @@ class MyAbstractItemDelegate : public QAbstractItemDelegate
{ {
public: public:
MyAbstractItemDelegate() : QAbstractItemDelegate() {}; MyAbstractItemDelegate() : QAbstractItemDelegate() {};
void paint(QPainter *, const QStyleOptionViewItem &, const QModelIndex &) const {} void paint(QPainter *, const QStyleOptionViewItem &, const QModelIndex &) const override {}
QSize sizeHint(const QStyleOptionViewItem &, const QModelIndex &) const { return QSize(); } QSize sizeHint(const QStyleOptionViewItem &, const QModelIndex &) const override { return QSize(); }
}; };
class MyAbstractItemModel: public QAbstractItemModel class MyAbstractItemModel: public QAbstractItemModel
{ {
public: public:
MyAbstractItemModel() : QAbstractItemModel() {}; MyAbstractItemModel() : QAbstractItemModel() {};
QModelIndex index(int, int, const QModelIndex &) const { return QModelIndex(); } QModelIndex index(int, int, const QModelIndex &) const override { return QModelIndex(); }
QModelIndex parent(const QModelIndex &) const { return QModelIndex(); } QModelIndex parent(const QModelIndex &) const override { return QModelIndex(); }
int rowCount(const QModelIndex &) const { return 0; } int rowCount(const QModelIndex &) const override { return 0; }
int columnCount(const QModelIndex &) const { return 0; } int columnCount(const QModelIndex &) const override { return 0; }
bool hasChildren(const QModelIndex &) const { return false; } bool hasChildren(const QModelIndex &) const override { return false; }
QVariant data(const QModelIndex &, int) const { return QVariant(); } QVariant data(const QModelIndex &, int) const override { return QVariant(); }
bool setData(const QModelIndex &, const QVariant &, int) { return false; } bool setData(const QModelIndex &, const QVariant &, int) override { return false; }
bool insertRows(int, int, const QModelIndex &) { return false; } bool insertRows(int, int, const QModelIndex &) override { return false; }
bool insertColumns(int, int, const QModelIndex &) { return false; } bool insertColumns(int, int, const QModelIndex &) override { return false; }
void setPersistent(const QModelIndex &, const QModelIndex &) {} void setPersistent(const QModelIndex &, const QModelIndex &) {}
bool removeRows (int, int, const QModelIndex &) { return false; } bool removeRows (int, int, const QModelIndex &) override { return false; }
bool removeColumns(int, int, const QModelIndex &) { return false; } bool removeColumns(int, int, const QModelIndex &) override { return false; }
void reset() {} void reset() {}
}; };
@ -202,16 +202,16 @@ class MyAbstractItemView : public QAbstractItemView
{ {
public: public:
MyAbstractItemView() : QAbstractItemView() {} MyAbstractItemView() : QAbstractItemView() {}
QRect visualRect(const QModelIndex &) const { return QRect(); } QRect visualRect(const QModelIndex &) const override { return QRect(); }
void scrollTo(const QModelIndex &, ScrollHint) {} void scrollTo(const QModelIndex &, ScrollHint) override {}
QModelIndex indexAt(const QPoint &) const { return QModelIndex(); } QModelIndex indexAt(const QPoint &) const override { return QModelIndex(); }
protected: protected:
QModelIndex moveCursor(CursorAction, Qt::KeyboardModifiers) { return QModelIndex(); } QModelIndex moveCursor(CursorAction, Qt::KeyboardModifiers) override { return QModelIndex(); }
int horizontalOffset() const { return 0; } int horizontalOffset() const override { return 0; }
int verticalOffset() const { return 0; } int verticalOffset() const override { return 0; }
bool isIndexHidden(const QModelIndex &) const { return false; } bool isIndexHidden(const QModelIndex &) const override { return false; }
void setSelection(const QRect &, QItemSelectionModel::SelectionFlags) {} void setSelection(const QRect &, QItemSelectionModel::SelectionFlags) override {}
QRegion visualRegionForSelection(const QItemSelection &) const { return QRegion(); } QRegion visualRegionForSelection(const QItemSelection &) const override { return QRegion(); }
}; };
void tst_QComboBox::initTestCase() void tst_QComboBox::initTestCase()
@ -1831,7 +1831,7 @@ public:
box->setGeometry(rect()); box->setGeometry(rect());
} }
void keyPressEvent(QKeyEvent *e) void keyPressEvent(QKeyEvent *e) override
{ {
received = (e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter); received = (e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter);
} }
@ -2666,13 +2666,13 @@ void tst_QComboBox::task260974_menuItemRectangleForComboBoxPopup()
public: public:
TestStyle() : QProxyStyle(QStyleFactory::create("windows")) { } 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; if (hint == SH_ComboBox_Popup) return 1;
else return QCommonStyle::styleHint(hint, option, widget, ret); 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) if (element == CE_MenuItem)
discoveredRect = option->rect; discoveredRect = option->rect;

6
tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp
View File

@ -864,18 +864,18 @@ void tst_QDockWidget::task169808_setFloating()
class MyWidget : public QWidget class MyWidget : public QWidget
{ {
public: public:
QSize sizeHint() const QSize sizeHint() const override
{ {
const QRect& deskRect = QGuiApplication::primaryScreen()->availableGeometry(); const QRect& deskRect = QGuiApplication::primaryScreen()->availableGeometry();
return QSize(qMin(300, deskRect.width() / 2), qMin(300, deskRect.height() / 2)); return QSize(qMin(300, deskRect.width() / 2), qMin(300, deskRect.height() / 2));
} }
QSize minimumSizeHint() const QSize minimumSizeHint() const override
{ {
return QSize(20,20); return QSize(20,20);
} }
void paintEvent(QPaintEvent *) void paintEvent(QPaintEvent *) override
{ {
QPainter p(this); QPainter p(this);
p.fillRect(rect(), Qt::red); p.fillRect(rect(), Qt::red);

12
tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp
View File

@ -52,25 +52,25 @@ public:
DoubleSpinBox(QWidget *parent = 0) DoubleSpinBox(QWidget *parent = 0)
: QDoubleSpinBox(parent) : QDoubleSpinBox(parent)
{ /*connect(this, SIGNAL(valueChanged(double)), this, SLOT(foo(double)));*/ } { /*connect(this, SIGNAL(valueChanged(double)), this, SLOT(foo(double)));*/ }
QString textFromValue(double v) const QString textFromValue(double v) const override
{ {
return QDoubleSpinBox::textFromValue(v); 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); return QDoubleSpinBox::validate(text, pos);
} }
double valueFromText(const QString &text) const double valueFromText(const QString &text) const override
{ {
return QDoubleSpinBox::valueFromText(text); return QDoubleSpinBox::valueFromText(text);
} }
#if QT_CONFIG(wheelevent) #if QT_CONFIG(wheelevent)
void wheelEvent(QWheelEvent *event) void wheelEvent(QWheelEvent *event) override
{ {
QDoubleSpinBox::wheelEvent(event); QDoubleSpinBox::wheelEvent(event);
} }
#endif #endif
void initStyleOption(QStyleOptionSpinBox *option) const void initStyleOption(QStyleOptionSpinBox *option) const override
{ {
QDoubleSpinBox::initStyleOption(option); QDoubleSpinBox::initStyleOption(option);
} }
@ -1172,7 +1172,7 @@ void tst_QDoubleSpinBox::taskQTBUG_5008_textFromValueAndValidate()
} }
//we use the French delimiters here //we use the French delimiters here
QString textFromValue (double value) const QString textFromValue (double value) const override
{ {
return locale().toString(value); return locale().toString(value);
} }

6
tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp
View File

@ -65,7 +65,7 @@ public:
{ {
m_timerId = startTimer(200); 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::MouseButtonPress, QPoint(6, 7), Qt::LeftButton, {}, {}));
QCoreApplication::postEvent(m_tb, new QMouseEvent(QEvent::MouseMove, QPoint(7, 8), Qt::LeftButton, 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); 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::MouseButtonPress, QPoint(230, 370), Qt::LeftButton, {}, {}));
QCoreApplication::postEvent(m_w, new QMouseEvent(QEvent::MouseButtonRelease, 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); return QSize(200, 200);
} }

2
tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp
View File

@ -705,7 +705,7 @@ public:
{ {
} }
void paintEvent(QPaintEvent *) void paintEvent(QPaintEvent *) override
{ {
QPainter p(this); QPainter p(this);
text.setText(QStringLiteral("test")); text.setText(QStringLiteral("test"));

4
tests/auto/widgets/widgets/qscrollarea/tst_qscrollarea.cpp
View File

@ -85,7 +85,7 @@ public:
setBackgroundRole(QPalette::Dark); setBackgroundRole(QPalette::Dark);
} }
protected: protected:
QVariant inputMethodQuery(Qt::InputMethodQuery query) const QVariant inputMethodQuery(Qt::InputMethodQuery query) const override
{ {
if (query == Qt::ImCursorRectangle) if (query == Qt::ImCursorRectangle)
return QRect(width() / 2, height() / 2, 5, 5); return QRect(width() / 2, height() / 2, 5, 5);
@ -120,7 +120,7 @@ class HFWWidget : public QWidget
{ {
public: public:
HFWWidget(); HFWWidget();
int heightForWidth(int w) const; int heightForWidth(int w) const override;
}; };
HFWWidget::HFWWidget() HFWWidget::HFWWidget()

4
tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp
View File

@ -101,8 +101,8 @@ void tst_QScrollBar::task_209492()
int scrollCount; int scrollCount;
MyScrollArea(QWidget *parent = 0) : QScrollArea(parent), scrollCount(0) {} MyScrollArea(QWidget *parent = 0) : QScrollArea(parent), scrollCount(0) {}
protected: protected:
void paintEvent(QPaintEvent *) { QTest::qSleep(600); } void paintEvent(QPaintEvent *) override { QTest::qSleep(600); }
void scrollContentsBy(int, int) { ++scrollCount; viewport()->update(); } void scrollContentsBy(int, int) override { ++scrollCount; viewport()->update(); }
}; };
MyScrollArea scrollArea; MyScrollArea scrollArea;

17
tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp
View File

@ -64,25 +64,25 @@ public:
SpinBox(QWidget *parent = 0) SpinBox(QWidget *parent = 0)
: QSpinBox(parent) : QSpinBox(parent)
{} {}
QString textFromValue(int v) const QString textFromValue(int v) const override
{ {
return QSpinBox::textFromValue(v); 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); return QSpinBox::validate(text, pos);
} }
int valueFromText(const QString &text) const int valueFromText(const QString &text) const override
{ {
return QSpinBox::valueFromText(text); return QSpinBox::valueFromText(text);
} }
#if QT_CONFIG(wheelevent) #if QT_CONFIG(wheelevent)
void wheelEvent(QWheelEvent *event) void wheelEvent(QWheelEvent *event) override
{ {
QSpinBox::wheelEvent(event); QSpinBox::wheelEvent(event);
} }
#endif #endif
void initStyleOption(QStyleOptionSpinBox *option) const void initStyleOption(QStyleOptionSpinBox *option) const override
{ {
QSpinBox::initStyleOption(option); QSpinBox::initStyleOption(option);
} }
@ -510,7 +510,8 @@ class ReadOnlyChangeTracker: public QSpinBox
public: public:
ReadOnlyChangeTracker(QWidget *parent = 0) : QSpinBox(parent) {} ReadOnlyChangeTracker(QWidget *parent = 0) : QSpinBox(parent) {}
void changeEvent(QEvent *ev) { void changeEvent(QEvent *ev) override
{
if (ev->type() == QEvent::ReadOnlyChange) if (ev->type() == QEvent::ReadOnlyChange)
++readOnlyChangeEventCount; ++readOnlyChangeEventCount;
} }
@ -1138,7 +1139,7 @@ void tst_QSpinBox::textFromValue()
class sizeHint_SpinBox : public QSpinBox class sizeHint_SpinBox : public QSpinBox
{ {
public: public:
QSize sizeHint() const QSize sizeHint() const override
{ {
++sizeHintRequests; ++sizeHintRequests;
return QSpinBox::sizeHint(); return QSpinBox::sizeHint();
@ -1198,7 +1199,7 @@ void tst_QSpinBox::taskQTBUG_5008_textFromValueAndValidate()
} }
//we use the French delimiters here //we use the French delimiters here
QString textFromValue (int value) const QString textFromValue (int value) const override
{ {
return locale().toString(value); return locale().toString(value);
} }

4
tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp
View File

@ -952,11 +952,11 @@ class MyTextEdit : public QTextEdit
{ {
setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum); setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
} }
virtual QSize minimumSizeHint () const virtual QSize minimumSizeHint () const override
{ {
return QSize(200, 200) * m_iFactor; return QSize(200, 200) * m_iFactor;
} }
virtual QSize sizeHint() const virtual QSize sizeHint() const override
{ {
return QSize(390, 390) * m_iFactor; return QSize(390, 390) * m_iFactor;
} }

4
tests/auto/widgets/widgets/qstackedwidget/tst_qstackedwidget.cpp
View File

@ -128,13 +128,13 @@ public:
createWidgets(); createWidgets();
} }
virtual void showEvent (QShowEvent *) virtual void showEvent (QShowEvent *) override
{ {
if (!m_staticWidgets) if (!m_staticWidgets)
createWidgets(); createWidgets();
} }
virtual void hideEvent (QHideEvent *) virtual void hideEvent (QHideEvent *) override
{ {
if (!m_staticWidgets) if (!m_staticWidgets)
destroyWidgets(); destroyWidgets();

2
tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp
View File

@ -702,7 +702,7 @@ public:
Widget10052(QWidget *parent) : QWidget(parent), moved(false) Widget10052(QWidget *parent) : QWidget(parent), moved(false)
{ } { }
void moveEvent(QMoveEvent *e) void moveEvent(QMoveEvent *e) override
{ {
moved = e->oldPos() != e->pos(); moved = e->oldPos() != e->pos();
QWidget::moveEvent(e); QWidget::moveEvent(e);

9
tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp
View File

@ -60,10 +60,12 @@ class QTabWidgetChild:public QTabWidget {
}; };
protected: protected:
virtual void tabInserted(int /*index */ ) { virtual void tabInserted(int /*index */ ) override
{
tabCount++; tabCount++;
}; };
virtual void tabRemoved(int /*index */ ) { virtual void tabRemoved(int /*index */ ) override
{
tabCount--; tabCount--;
}; };
int tabCount; int tabCount;
@ -553,7 +555,8 @@ public:
PaintCounter() :count(0) { setAttribute(Qt::WA_OpaquePaintEvent); } PaintCounter() :count(0) { setAttribute(Qt::WA_OpaquePaintEvent); }
int count; int count;
protected: protected:
void paintEvent(QPaintEvent*) { void paintEvent(QPaintEvent*) override
{
++count; ++count;
} }
}; };

3
tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp
View File

@ -483,7 +483,8 @@ void tst_QTextBrowser::anchorsWithSelfBuiltHtml()
class HelpBrowser : public QTextBrowser class HelpBrowser : public QTextBrowser
{ {
public: public:
virtual QVariant loadResource(int /*type*/, const QUrl &name) { virtual QVariant loadResource(int /*type*/, const QUrl &name) override
{
QString url = name.toString(); QString url = name.toString();
if(url == "qhelp://docs/index.html") { if(url == "qhelp://docs/index.html") {
return "index"; return "index";

33
tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp
View File

@ -334,18 +334,18 @@ public:
inline QtTestDocumentLayout(QTextEdit *edit, QTextDocument *doc, int &itCount) inline QtTestDocumentLayout(QTextEdit *edit, QTextDocument *doc, int &itCount)
: QAbstractTextDocumentLayout(doc), useBiggerSize(false), ed(edit), iterationCounter(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 frameBoundingRect(QTextFrame *) const override { return QRectF(); }
virtual QRectF blockBoundingRect(const QTextBlock &) const { return QRectF(); } virtual QRectF blockBoundingRect(const QTextBlock &) const override { return QRectF(); }
bool useBiggerSize; bool useBiggerSize;
QSize usedSize; QSize usedSize;
@ -1444,15 +1444,15 @@ public:
mutable int canInsertCallCount; mutable int canInsertCallCount;
mutable int insertCallCount; mutable int insertCallCount;
virtual QMimeData *createMimeDataFromSelection() const { virtual QMimeData *createMimeDataFromSelection() const override {
createMimeDataCallCount++; createMimeDataCallCount++;
return QTextEdit::createMimeDataFromSelection(); return QTextEdit::createMimeDataFromSelection();
} }
virtual bool canInsertFromMimeData(const QMimeData *source) const { virtual bool canInsertFromMimeData(const QMimeData *source) const override {
canInsertCallCount++; canInsertCallCount++;
return QTextEdit::canInsertFromMimeData(source); return QTextEdit::canInsertFromMimeData(source);
} }
virtual void insertFromMimeData(const QMimeData *source) { virtual void insertFromMimeData(const QMimeData *source) override {
insertCallCount++; insertCallCount++;
QTextEdit::insertFromMimeData(source); QTextEdit::insertFromMimeData(source);
} }
@ -1604,7 +1604,7 @@ public:
bool resizeEventCalled; bool resizeEventCalled;
protected: protected:
virtual void resizeEvent(QResizeEvent *e) virtual void resizeEvent(QResizeEvent *e) override
{ {
QTextEdit::resizeEvent(e); 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())); 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. // enable full-width-selection for our test widget.
class FullWidthStyle : public QCommonStyle { 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) if (stylehint == QStyle::SH_RichText_FullWidthSelection)
return 1; return 1;
return QCommonStyle::styleHint(stylehint, opt, widget, returnData); return QCommonStyle::styleHint(stylehint, opt, widget, returnData);
@ -2565,7 +2566,7 @@ void tst_QTextEdit::highlightLongLine()
class NumHighlighter : public QSyntaxHighlighter { class NumHighlighter : public QSyntaxHighlighter {
public: public:
explicit NumHighlighter(QTextDocument*doc) : QSyntaxHighlighter(doc) {}; explicit NumHighlighter(QTextDocument*doc) : QSyntaxHighlighter(doc) {};
virtual void highlightBlock(const QString& text) { virtual void highlightBlock(const QString& text) override {
// odd number in bold // odd number in bold
QTextCharFormat format; QTextCharFormat format;
format.setFontWeight(QFont::Bold); format.setFontWeight(QFont::Bold);
@ -2644,7 +2645,7 @@ public:
TextEdit(QWidget *parent = 0) TextEdit(QWidget *parent = 0)
: QTextEdit(parent) : QTextEdit(parent)
{} {}
void wheelEvent(QWheelEvent *event) void wheelEvent(QWheelEvent *event) override
{ {
QTextEdit::wheelEvent(event); QTextEdit::wheelEvent(event);
} }
@ -2703,12 +2704,12 @@ namespace {
} }
QPaintEngine *paintEngine () const QPaintEngine *paintEngine () const override
{ {
return m_paintEngine; return m_paintEngine;
} }
int metric (QPaintDevice::PaintDeviceMetric metric) const { int metric (QPaintDevice::PaintDeviceMetric metric) const override {
switch (metric) { switch (metric) {
case QPaintDevice::PdmWidth: case QPaintDevice::PdmWidth:
case QPaintDevice::PdmHeight: case QPaintDevice::PdmHeight: