1 files changed, 27 insertions, 26 deletions

diff --git a/src/widgets/doc/snippets/code/doc_src_layout.cpp b/src/widgets/doc/snippets/code/doc_src_layout.cpp
index 5e9a740244..7bbd781bb2 100644
--- a/src/widgets/doc/snippets/code/doc_src_layout.cpp
+++ b/src/widgets/doc/snippets/code/doc_src_layout.cpp
@@ -53,14 +53,15 @@
 #define CARD_H
 
 #include <QtWidgets>
-#include <QList>
+#include <QVector>
 
 class CardLayout : public QLayout
 {
 public:
-    CardLayout(QWidget *parent, int dist): QLayout(parent, 0, dist) {}
-    CardLayout(QLayout *parent, int dist): QLayout(parent, dist) {}
-    CardLayout(int dist): QLayout(dist) {}
+    CardLayout(int spacing): QLayout()
+    { setSpacing(spacing); }
+    CardLayout(int spacing, QWidget *parent): QLayout(parent)
+    { setSpacing(spacing); }
     ~CardLayout();
 
     void addItem(QLayoutItem *item) override;
@@ -72,7 +73,7 @@ public:
     void setGeometry(const QRect &rect) override;
 
 private:
-    QList<QLayoutItem*> list;
+    QVector<QLayoutItem*> m_items;
 };
 #endif
 //! [0]
@@ -85,23 +86,23 @@ private:
 //! [2]
 int CardLayout::count() const
 {
-    // QList::size() returns the number of QLayoutItems in the list
-    return list.size();
+    // QVector::size() returns the number of QLayoutItems in m_items
+    return m_items.size();
 }
 //! [2]
 
 //! [3]
 QLayoutItem *CardLayout::itemAt(int idx) const
 {
-    // QList::value() performs index checking, and returns 0 if we are
+    // QVector::value() performs index checking, and returns nullptr if we are
     // outside the valid range
-    return list.value(idx);
+    return m_items.value(idx);
 }
 
 QLayoutItem *CardLayout::takeAt(int idx)
 {
-    // QList::take does not do index checking
-    return idx >= 0 && idx < list.size() ? list.takeAt(idx) : 0;
+    // QVector::take does not do index checking
+    return idx >= 0 && idx < m_items.size() ? m_items.takeAt(idx) : 0;
 }
 //! [3]
 
@@ -109,7 +110,7 @@ QLayoutItem *CardLayout::takeAt(int idx)
 //! [4]
 void CardLayout::addItem(QLayoutItem *item)
 {
-    list.append(item);
+    m_items.append(item);
 }
 //! [4]
 
@@ -129,14 +130,14 @@ void CardLayout::setGeometry(const QRect &r)
 {
     QLayout::setGeometry(r);
 
-    if (list.size() == 0)
+    if (m_items.size() == 0)
         return;
 
-    int w = r.width() - (list.count() - 1) * spacing();
-    int h = r.height() - (list.count() - 1) * spacing();
+    int w = r.width() - (m_items.count() - 1) * spacing();
+    int h = r.height() - (m_items.count() - 1) * spacing();
     int i = 0;
-    while (i < list.size()) {
-        QLayoutItem *o = list.at(i);
+    while (i < m_items.size()) {
+        QLayoutItem *o = m_items.at(i);
         QRect geom(r.x() + i * spacing(), r.y() + i * spacing(), w, h);
         o->setGeometry(geom);
         ++i;
@@ -148,29 +149,29 @@ void CardLayout::setGeometry(const QRect &r)
 //! [7]
 QSize CardLayout::sizeHint() const
 {
-    QSize s(0,0);
-    int n = list.count();
+    QSize s(0, 0);
+    int n = m_items.count();
     if (n > 0)
-        s = QSize(100,70); //start with a nice default size
+        s = QSize(100, 70); //start with a nice default size
     int i = 0;
     while (i < n) {
-        QLayoutItem *o = list.at(i);
+        QLayoutItem *o = m_items.at(i);
         s = s.expandedTo(o->sizeHint());
         ++i;
     }
-    return s + n*QSize(spacing(), spacing());
+    return s + n * QSize(spacing(), spacing());
 }
 
 QSize CardLayout::minimumSize() const
 {
-    QSize s(0,0);
-    int n = list.count();
+    QSize s(0, 0);
+    int n = m_items.count();
     int i = 0;
     while (i < n) {
-        QLayoutItem *o = list.at(i);
+        QLayoutItem *o = m_items.at(i);
         s = s.expandedTo(o->minimumSize());
         ++i;
     }
-    return s + n*QSize(spacing(), spacing());
+    return s + n * QSize(spacing(), spacing());
 }
 //! [7]