diff options
author | Jason McDonald <jason.mcdonald@nokia.com> | 2012-03-27 01:05:41 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-26 21:30:45 +0200 |
commit | 6a1d1165c2392e1ab5f493ce324942faa4d5df43 (patch) | |
tree | 8476f44e41493b7b2c8ad946033d6adfd921bf32 /src/widgets | |
parent | 15e9b77cacc030016e13dc4571328c56ff26e5db (diff) |
Make QGridLayout::getItemPosition() const.
This commit addresses a long-standing Qt 5 to-do. Whilst a trivial
change, it is binary incompatible.
Task-number: QTBUG-1433
Change-Id: I6e31e47fd5791cb6f1373e2696ffc95f7174f0b0
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/widgets')
-rw-r--r-- | src/widgets/kernel/qgridlayout.cpp | 8 | ||||
-rw-r--r-- | src/widgets/kernel/qgridlayout.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/widgets/kernel/qgridlayout.cpp b/src/widgets/kernel/qgridlayout.cpp index 3607d88d9e..39daf96eb8 100644 --- a/src/widgets/kernel/qgridlayout.cpp +++ b/src/widgets/kernel/qgridlayout.cpp @@ -167,9 +167,9 @@ public: return item; } - void getItemPosition(int index, int *row, int *column, int *rowSpan, int *columnSpan) { + void getItemPosition(int index, int *row, int *column, int *rowSpan, int *columnSpan) const { if (index < things.count()) { - QGridBox *b = things.at(index); + const QGridBox *b = things.at(index); int toRow = b->toRow(rr); int toCol = b->toCol(cc); *row = b->row; @@ -1347,9 +1347,9 @@ QLayoutItem *QGridLayout::takeAt(int index) \sa itemAtPosition(), itemAt() */ -void QGridLayout::getItemPosition(int index, int *row, int *column, int *rowSpan, int *columnSpan) +void QGridLayout::getItemPosition(int index, int *row, int *column, int *rowSpan, int *columnSpan) const { - Q_D(QGridLayout); + Q_D(const QGridLayout); d->getItemPosition(index, row, column, rowSpan, columnSpan); } diff --git a/src/widgets/kernel/qgridlayout.h b/src/widgets/kernel/qgridlayout.h index 02789b7794..930fdf4511 100644 --- a/src/widgets/kernel/qgridlayout.h +++ b/src/widgets/kernel/qgridlayout.h @@ -120,7 +120,7 @@ public: void addItem(QLayoutItem *item, int row, int column, int rowSpan = 1, int columnSpan = 1, Qt::Alignment = 0); void setDefaultPositioning(int n, Qt::Orientation orient); - void getItemPosition(int idx, int *row, int *column, int *rowSpan, int *columnSpan); + void getItemPosition(int idx, int *row, int *column, int *rowSpan, int *columnSpan) const; protected: void addItem(QLayoutItem *); |