diff options
Diffstat (limited to 'src/widgets/kernel/qstackedlayout.cpp')
-rw-r--r-- | src/widgets/kernel/qstackedlayout.cpp | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/widgets/kernel/qstackedlayout.cpp b/src/widgets/kernel/qstackedlayout.cpp index 78177aa0cd..04eacf1d41 100644 --- a/src/widgets/kernel/qstackedlayout.cpp +++ b/src/widgets/kernel/qstackedlayout.cpp @@ -8,6 +8,8 @@ #include "private/qwidget_p.h" #include "private/qlayoutengine_p.h" +#include <QtCore/qpointer.h> + #include <memory> QT_BEGIN_NAMESPACE @@ -166,7 +168,7 @@ QStackedLayout::~QStackedLayout() int QStackedLayout::addWidget(QWidget *widget) { Q_D(QStackedLayout); - return insertWidget(d->list.count(), widget); + return insertWidget(d->list.size(), widget); } /*! @@ -187,9 +189,9 @@ int QStackedLayout::insertWidget(int index, QWidget *widget) { Q_D(QStackedLayout); addChildWidget(widget); - index = qMin(index, d->list.count()); + index = qMin(index, d->list.size()); if (index < 0) - index = d->list.count(); + index = d->list.size(); QWidgetItem *wi = QLayoutPrivate::createWidgetItem(this, widget); d->list.insert(index, wi); invalidate(); @@ -234,8 +236,8 @@ QLayoutItem *QStackedLayout::takeAt(int index) QLayoutItem *item = d->list.takeAt(index); if (index == d->index) { d->index = -1; - if ( d->list.count() > 0 ) { - int newIndex = (index == d->list.count()) ? index-1 : index; + if ( d->list.size() > 0 ) { + int newIndex = (index == d->list.size()) ? index-1 : index; setCurrentIndex(newIndex); } else { emit currentChanged(-1); @@ -403,7 +405,7 @@ QSize QStackedLayout::sizeHint() const { Q_D(const QStackedLayout); QSize s(0, 0); - int n = d->list.count(); + int n = d->list.size(); for (int i = 0; i < n; ++i) if (QWidget *widget = d->list.at(i)->widget()) { @@ -424,7 +426,7 @@ QSize QStackedLayout::minimumSize() const { Q_D(const QStackedLayout); QSize s(0, 0); - int n = d->list.count(); + int n = d->list.size(); for (int i = 0; i < n; ++i) if (QWidget *widget = d->list.at(i)->widget()) @@ -444,7 +446,7 @@ void QStackedLayout::setGeometry(const QRect &rect) widget->setGeometry(rect); break; case StackAll: - if (const int n = d->list.count()) + if (const int n = d->list.size()) for (int i = 0; i < n; ++i) if (QWidget *widget = d->list.at(i)->widget()) widget->setGeometry(rect); @@ -531,7 +533,7 @@ void QStackedLayout::setStackingMode(StackingMode stackingMode) return; d->stackingMode = stackingMode; - const int n = d->list.count(); + const int n = d->list.size(); if (n == 0) return; |