diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2014-11-16 13:09:01 +0100 |
|---|---|---|
| committer | Olivier Goffart <ogoffart@woboq.com> | 2014-12-03 09:57:11 +0100 |
| commit | 5180f32c5abe01acd65cde68c2c16aedda4028ec (patch) | |
| tree | a8ed3b4af80751cdc0442c750f2915bfa9c8af40 /src/widgets/kernel/qlayout.h | |
| parent | 2e271795e7c460254a27ea617846ff7b598a7b9b (diff) | |
| download | qtbase-5180f32c5abe01acd65cde68c2c16aedda4028ec.tar.gz | |
Add Q_DECL_OVERRIDE in the src subdirectory
Done automatically with clang-modernize on linux
(But does not add Q_DECL_OVERRIDE to the function that are marked
as inline because it a compilation error with MSVC2010)
Change-Id: I2196ee26e3e6fe20816834ecea5ea389eeab3171
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/widgets/kernel/qlayout.h')
| -rw-r--r-- | src/widgets/kernel/qlayout.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/widgets/kernel/qlayout.h b/src/widgets/kernel/qlayout.h index 38568e434c..79cb7a7d14 100644 --- a/src/widgets/kernel/qlayout.h +++ b/src/widgets/kernel/qlayout.h @@ -101,8 +101,8 @@ public: QWidget *parentWidget() const; - void invalidate(); - QRect geometry() const; + void invalidate() Q_DECL_OVERRIDE; + QRect geometry() const Q_DECL_OVERRIDE; bool activate(); void update(); @@ -112,16 +112,16 @@ public: void removeWidget(QWidget *w); void removeItem(QLayoutItem *); - Qt::Orientations expandingDirections() const; - QSize minimumSize() const; - QSize maximumSize() const; - virtual void setGeometry(const QRect&); + Qt::Orientations expandingDirections() const Q_DECL_OVERRIDE; + QSize minimumSize() const Q_DECL_OVERRIDE; + QSize maximumSize() const Q_DECL_OVERRIDE; + virtual void setGeometry(const QRect&) Q_DECL_OVERRIDE; virtual QLayoutItem *itemAt(int index) const = 0; virtual QLayoutItem *takeAt(int index) = 0; virtual int indexOf(QWidget *) const; virtual int count() const = 0; - bool isEmpty() const; - QSizePolicy::ControlTypes controlTypes() const; + bool isEmpty() const Q_DECL_OVERRIDE; + QSizePolicy::ControlTypes controlTypes() const Q_DECL_OVERRIDE; // ### Qt 6 make this function virtual QLayoutItem *replaceWidget(QWidget *from, QWidget *to, Qt::FindChildOptions options = Qt::FindChildrenRecursively); @@ -130,7 +130,7 @@ public: QSize totalMinimumSize() const; QSize totalMaximumSize() const; QSize totalSizeHint() const; - QLayout *layout(); + QLayout *layout() Q_DECL_OVERRIDE; void setEnabled(bool); bool isEnabled() const; @@ -140,7 +140,7 @@ public: protected: void widgetEvent(QEvent *); - void childEvent(QChildEvent *e); + void childEvent(QChildEvent *e) Q_DECL_OVERRIDE; void addChildLayout(QLayout *l); void addChildWidget(QWidget *w); bool adoptLayout(QLayout *layout); |