summaryrefslogtreecommitdiffstats
path: root/src/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'src/widgets')
-rw-r--r--src/widgets/graphicsview/qgraphicsitem_p.h16
-rw-r--r--src/widgets/kernel/qwidget_p.h16
-rw-r--r--src/widgets/widgets/qabstractbutton.h2
-rw-r--r--src/widgets/widgets/qdockwidget.cpp2
-rw-r--r--src/widgets/widgets/qmdiarea_p.h6
-rw-r--r--src/widgets/widgets/qtabbar_p.h2
6 files changed, 22 insertions, 22 deletions
diff --git a/src/widgets/graphicsview/qgraphicsitem_p.h b/src/widgets/graphicsview/qgraphicsitem_p.h
index 4af39cac2f..0dd192caed 100644
--- a/src/widgets/graphicsview/qgraphicsitem_p.h
+++ b/src/widgets/graphicsview/qgraphicsitem_p.h
@@ -658,28 +658,28 @@ public:
: QGraphicsEffectSourcePrivate(), item(i), info(0)
{}
- inline void detach()
+ void detach() Q_DECL_OVERRIDE
{
item->d_ptr->graphicsEffect = 0;
item->prepareGeometryChange();
}
- inline const QGraphicsItem *graphicsItem() const
+ const QGraphicsItem *graphicsItem() const Q_DECL_OVERRIDE
{ return item; }
- inline const QWidget *widget() const
+ const QWidget *widget() const Q_DECL_OVERRIDE
{ return 0; }
- inline void update() {
+ void update() Q_DECL_OVERRIDE {
item->d_ptr->updateDueToGraphicsEffect = true;
item->update();
item->d_ptr->updateDueToGraphicsEffect = false;
}
- inline void effectBoundingRectChanged()
+ void effectBoundingRectChanged() Q_DECL_OVERRIDE
{ item->prepareGeometryChange(); }
- inline bool isPixmap() const
+ bool isPixmap() const Q_DECL_OVERRIDE
{
return item->type() == QGraphicsPixmapItem::Type
&& !(item->flags() & QGraphicsItem::ItemIsSelectable)
@@ -687,10 +687,10 @@ public:
//|| (item->d_ptr->isObject && qobject_cast<QDeclarativeImage *>(q_func()));
}
- inline const QStyleOption *styleOption() const
+ const QStyleOption *styleOption() const Q_DECL_OVERRIDE
{ return info ? info->option : 0; }
- inline QRect deviceRect() const
+ QRect deviceRect() const Q_DECL_OVERRIDE
{
if (!info || !info->widget) {
qWarning("QGraphicsEffectSource::deviceRect: Not yet implemented, lacking device context");
diff --git a/src/widgets/kernel/qwidget_p.h b/src/widgets/kernel/qwidget_p.h
index 770ef0731d..6e4c93e7be 100644
--- a/src/widgets/kernel/qwidget_p.h
+++ b/src/widgets/kernel/qwidget_p.h
@@ -876,26 +876,26 @@ public:
: QGraphicsEffectSourcePrivate(), m_widget(widget), context(0), updateDueToGraphicsEffect(false)
{}
- inline void detach()
+ void detach() Q_DECL_OVERRIDE
{ m_widget->d_func()->graphicsEffect = 0; }
- inline const QGraphicsItem *graphicsItem() const
+ const QGraphicsItem *graphicsItem() const Q_DECL_OVERRIDE
{ return 0; }
- inline const QWidget *widget() const
+ const QWidget *widget() const Q_DECL_OVERRIDE
{ return m_widget; }
- inline void update()
+ void update() Q_DECL_OVERRIDE
{
updateDueToGraphicsEffect = true;
m_widget->update();
updateDueToGraphicsEffect = false;
}
- inline bool isPixmap() const
+ bool isPixmap() const Q_DECL_OVERRIDE
{ return false; }
- inline void effectBoundingRectChanged()
+ void effectBoundingRectChanged() Q_DECL_OVERRIDE
{
// ### This function should take a rect parameter; then we can avoid
// updating too much on the parent widget.
@@ -905,10 +905,10 @@ public:
update();
}
- inline const QStyleOption *styleOption() const
+ const QStyleOption *styleOption() const Q_DECL_OVERRIDE
{ return 0; }
- inline QRect deviceRect() const
+ QRect deviceRect() const Q_DECL_OVERRIDE
{ return m_widget->window()->rect(); }
QRectF boundingRect(Qt::CoordinateSystem system) const Q_DECL_OVERRIDE;
diff --git a/src/widgets/widgets/qabstractbutton.h b/src/widgets/widgets/qabstractbutton.h
index c80e2e9d5d..400233caa9 100644
--- a/src/widgets/widgets/qabstractbutton.h
+++ b/src/widgets/widgets/qabstractbutton.h
@@ -117,7 +117,7 @@ Q_SIGNALS:
void toggled(bool checked);
protected:
- virtual void paintEvent(QPaintEvent *e) = 0;
+ void paintEvent(QPaintEvent *e) Q_DECL_OVERRIDE = 0;
virtual bool hitButton(const QPoint &pos) const;
virtual void checkStateSet();
virtual void nextCheckState();
diff --git a/src/widgets/widgets/qdockwidget.cpp b/src/widgets/widgets/qdockwidget.cpp
index 24c0323691..a0a51fb609 100644
--- a/src/widgets/widgets/qdockwidget.cpp
+++ b/src/widgets/widgets/qdockwidget.cpp
@@ -110,7 +110,7 @@ public:
QDockWidgetTitleButton(QDockWidget *dockWidget);
QSize sizeHint() const Q_DECL_OVERRIDE;
- inline QSize minimumSizeHint() const
+ QSize minimumSizeHint() const Q_DECL_OVERRIDE
{ return sizeHint(); }
void enterEvent(QEvent *event) Q_DECL_OVERRIDE;
diff --git a/src/widgets/widgets/qmdiarea_p.h b/src/widgets/widgets/qmdiarea_p.h
index d1341d5837..170584a803 100644
--- a/src/widgets/widgets/qmdiarea_p.h
+++ b/src/widgets/widgets/qmdiarea_p.h
@@ -82,7 +82,7 @@ class RegularTiler : public Rearranger
// covering the entire domain.
// Both positions and sizes may change.
void rearrange(QList<QWidget *> &widgets, const QRect &domain) const Q_DECL_OVERRIDE;
- inline Type type() const { return Rearranger::RegularTiler; }
+ Type type() const Q_DECL_OVERRIDE { return Rearranger::RegularTiler; }
};
class SimpleCascader : public Rearranger
@@ -91,7 +91,7 @@ class SimpleCascader : public Rearranger
// Widgets are resized to minimumSize.
// Both positions and sizes may change.
void rearrange(QList<QWidget *> &widgets, const QRect &domain) const Q_DECL_OVERRIDE;
- inline Type type() const { return Rearranger::SimpleCascader; }
+ Type type() const Q_DECL_OVERRIDE { return Rearranger::SimpleCascader; }
};
class IconTiler : public Rearranger
@@ -100,7 +100,7 @@ class IconTiler : public Rearranger
// tiling pattern filling up the domain from the bottom.
// Only positions may change.
void rearrange(QList<QWidget *> &widgets, const QRect &domain) const Q_DECL_OVERRIDE;
- inline Type type() const { return Rearranger::IconTiler; }
+ Type type() const Q_DECL_OVERRIDE { return Rearranger::IconTiler; }
};
class Placer
diff --git a/src/widgets/widgets/qtabbar_p.h b/src/widgets/widgets/qtabbar_p.h
index 747dcd3a58..7a36e2e92d 100644
--- a/src/widgets/widgets/qtabbar_p.h
+++ b/src/widgets/widgets/qtabbar_p.h
@@ -251,7 +251,7 @@ public:
CloseButton(QWidget *parent = 0);
QSize sizeHint() const Q_DECL_OVERRIDE;
- inline QSize minimumSizeHint() const
+ QSize minimumSizeHint() const Q_DECL_OVERRIDE
{ return sizeHint(); }
void enterEvent(QEvent *event) Q_DECL_OVERRIDE;
void leaveEvent(QEvent *event) Q_DECL_OVERRIDE;
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 10:26:54 +0000