diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2020-08-08 02:14:58 +0200 |
|---|---|---|
| committer | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2020-08-23 00:33:01 +0200 |
| commit | 2e7f11246e8b5bd0952c3b498da04ae4fc14f264 (patch) | |
| tree | f350529b2c3ce51206a390ca11bb53fd366129e5 /src/widgets/kernel/qlayout.cpp | |
| parent | 7ec818e74ad1d346f40b17c338de424a0f45fa12 (diff) | |
QLayout: make its indexOf functions take pointer-to-const
Try to fix an API mistake there: there is no reason why these
functions should take pointers to non-const widgets, as that
actually preventing reasonable code (e.g. finding out the index
of "this" inside a const method of a QWidget subclass).
Unfortunately, indexOf(QWidget*) is also virtual, meaning that
changing its signature is an API break. Hopefully, there are
only few users that override this method (Woboq says 0).
[ChangeLog][Potentially Source-Incompatible Changes]
The QLayout::indexOf(QWidget *) virtual function has changed
signature, becoming QLayout::indexOf(const QWidget *).
This is source incompatible, although the fix (for the few
users that do override indexOf() in their layouts) is
straightforward.
Change-Id: Id2183f5ecd9dc7e2a37c7355266e8494ef7929f2
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Diffstat (limited to 'src/widgets/kernel/qlayout.cpp')
| -rw-r--r-- | src/widgets/kernel/qlayout.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/widgets/kernel/qlayout.cpp b/src/widgets/kernel/qlayout.cpp index bbc7e793c4..431c93596a 100644 --- a/src/widgets/kernel/qlayout.cpp +++ b/src/widgets/kernel/qlayout.cpp @@ -1177,9 +1177,9 @@ QLayoutItem *QLayout::replaceWidget(QWidget *from, QWidget *to, Qt::FindChildOpt Returns the index of \a widget, or -1 if \a widget is not found. - The default implementation iterates over all items using itemAt() + The default implementation iterates over all items using itemAt(). */ -int QLayout::indexOf(QWidget *widget) const +int QLayout::indexOf(const QWidget *widget) const { int i = 0; QLayoutItem *item = itemAt(i); @@ -1199,7 +1199,7 @@ int QLayout::indexOf(QWidget *widget) const Returns the index of \a layoutItem, or -1 if \a layoutItem is not found. */ -int QLayout::indexOf(QLayoutItem *layoutItem) const +int QLayout::indexOf(const QLayoutItem *layoutItem) const { int i = 0; QLayoutItem *item = itemAt(i); |