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/qgridlayout.h | |
parent | 2e271795e7c460254a27ea617846ff7b598a7b9b (diff) |
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/qgridlayout.h')
-rw-r--r-- | src/widgets/kernel/qgridlayout.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/widgets/kernel/qgridlayout.h b/src/widgets/kernel/qgridlayout.h index 95d8a0a445..89ece8f080 100644 --- a/src/widgets/kernel/qgridlayout.h +++ b/src/widgets/kernel/qgridlayout.h @@ -59,9 +59,9 @@ public: ~QGridLayout(); - QSize sizeHint() const; - QSize minimumSize() const; - QSize maximumSize() const; + QSize sizeHint() const Q_DECL_OVERRIDE; + QSize minimumSize() const Q_DECL_OVERRIDE; + QSize maximumSize() const Q_DECL_OVERRIDE; void setHorizontalSpacing(int spacing); int horizontalSpacing() const; @@ -85,12 +85,12 @@ public: QRect cellRect(int row, int column) const; - bool hasHeightForWidth() const; - int heightForWidth(int) const; - int minimumHeightForWidth(int) const; + bool hasHeightForWidth() const Q_DECL_OVERRIDE; + int heightForWidth(int) const Q_DECL_OVERRIDE; + int minimumHeightForWidth(int) const Q_DECL_OVERRIDE; - Qt::Orientations expandingDirections() const; - void invalidate(); + Qt::Orientations expandingDirections() const Q_DECL_OVERRIDE; + void invalidate() Q_DECL_OVERRIDE; inline void addWidget(QWidget *w) { QLayout::addWidget(w); } void addWidget(QWidget *, int row, int column, Qt::Alignment = 0); @@ -101,11 +101,11 @@ public: void setOriginCorner(Qt::Corner); Qt::Corner originCorner() const; - QLayoutItem *itemAt(int index) const; + QLayoutItem *itemAt(int index) const Q_DECL_OVERRIDE; QLayoutItem *itemAtPosition(int row, int column) const; - QLayoutItem *takeAt(int index); - int count() const; - void setGeometry(const QRect&); + QLayoutItem *takeAt(int index) Q_DECL_OVERRIDE; + int count() const Q_DECL_OVERRIDE; + void setGeometry(const QRect&) Q_DECL_OVERRIDE; void addItem(QLayoutItem *item, int row, int column, int rowSpan = 1, int columnSpan = 1, Qt::Alignment = 0); @@ -113,7 +113,7 @@ public: void getItemPosition(int idx, int *row, int *column, int *rowSpan, int *columnSpan) const; protected: - void addItem(QLayoutItem *); + void addItem(QLayoutItem *) Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(QGridLayout) |