summaryrefslogtreecommitdiffstats
path: root/examples/widgets/scroller
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@woboq.com>2014-07-14 09:13:02 +0200
committerOlivier Goffart <ogoffart@woboq.com>2014-07-15 08:44:44 +0200
commit3b0c2b7c1b3ccdfe6867884a7e210bfc63e10f84 (patch)
tree4c75a4fa9f023c4bfc6746a4412922a8efe3b017 /examples/widgets/scroller
parent6d87e3ed40173eac8c275d5926266359d53c74c7 (diff)
Examples: Add Q_DECL_OVERRIDE to overridden functions
Q_DECL_OVERRIDE (which expands to 'override' for supported compiler) helps to declare the intent (that it is an overridden function) and force compilation error when there is no such virtual function in the base class. The examples should show the best practice of having it, as it may save the programmer quite some time in case of change of API or typo in the function name or arguments. This change was done automatically with clang-modernize -add-override -override-macros And fixed MSVC compilation by removing inline for TorrentViewDelegate::paint Change-Id: Ice66ae93fae571266f908703d5b8892b2c1ebb1a Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Diffstat (limited to 'examples/widgets/scroller')
-rw-r--r--examples/widgets/scroller/graphicsview/main.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/examples/widgets/scroller/graphicsview/main.cpp b/examples/widgets/scroller/graphicsview/main.cpp
index c17529d7c8..ef81315ca7 100644
--- a/examples/widgets/scroller/graphicsview/main.cpp
+++ b/examples/widgets/scroller/graphicsview/main.cpp
@@ -64,7 +64,7 @@ public:
setFlag(QGraphicsItem::ItemClipsToShape, true);
}
- QRectF boundingRect() const
+ QRectF boundingRect() const Q_DECL_OVERRIDE
{
// here we only want the size of the children and not the size of the children of the children...
qreal halfpw = m_pen.widthF() / 2;
@@ -75,7 +75,7 @@ public:
return rect;
}
- void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+ void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) Q_DECL_OVERRIDE
{
Q_UNUSED(option);
Q_UNUSED(widget);
@@ -104,7 +104,7 @@ public:
: QGraphicsObject(parent)
{ }
- QRectF boundingRect() const
+ QRectF boundingRect() const Q_DECL_OVERRIDE
{
QRectF rect;
foreach (QGraphicsItem *item, childItems())
@@ -112,7 +112,7 @@ public:
return rect;
}
- void paint(QPainter*, const QStyleOptionGraphicsItem*, QWidget*)
+ void paint(QPainter*, const QStyleOptionGraphicsItem*, QWidget*) Q_DECL_OVERRIDE
{ }
};
@@ -140,7 +140,7 @@ public:
return m_viewport;
}
- bool event(QEvent *e)
+ bool event(QEvent *e) Q_DECL_OVERRIDE
{
switch (e->type()) {
// ![2]
@@ -169,7 +169,7 @@ public:
return QGraphicsObject::event(e);
}
- bool sceneEvent(QEvent *e)
+ bool sceneEvent(QEvent *e) Q_DECL_OVERRIDE
{
switch (e->type()) {
case QEvent::TouchBegin: {
@@ -194,12 +194,12 @@ public:
return QGraphicsObject::sceneEvent(e);
}
- QRectF boundingRect() const
+ QRectF boundingRect() const Q_DECL_OVERRIDE
{
return QRectF(0, 0, m_size.width() + 3, m_size.height());
}
- void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+ void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) Q_DECL_OVERRIDE
{
Q_UNUSED(option);
Q_UNUSED(widget);
@@ -265,7 +265,7 @@ public:
protected:
- void resizeEvent(QResizeEvent *e)
+ void resizeEvent(QResizeEvent *e) Q_DECL_OVERRIDE
{
// resize the scene according to our own size to prevent scrolling
m_scene->setSceneRect(0, 0, m_view->viewport()->width(), m_view->viewport()->height());