Layouts docs: pass parent widget in the ctor

This is a follow up from commit 1e904ab342c1aaa; changing more
documentation to pass a widget * in the ctor of a layout, rather
than creating a parent-less layout then calling setLayout().

Change-Id: I4fc59c6cfa46ccd279a153acd67335a6daf22ff9
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>

5 files changed, 13 insertions, 18 deletions

diff --git a/src/widgets/doc/snippets/code/src_gui_graphicsview_qgraphicsgridlayout.cpp b/src/widgets/doc/snippets/code/src_gui_graphicsview_qgraphicsgridlayout.cpp
index 7c55e1c4c9..3b46c54bad 100644
--- a/src/widgets/doc/snippets/code/src_gui_graphicsview_qgraphicsgridlayout.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_graphicsview_qgraphicsgridlayout.cpp
@@ -6,11 +6,10 @@ QGraphicsScene scene;
 QGraphicsWidget *textEdit = scene.addWidget(new QTextEdit);
 QGraphicsWidget *pushButton = scene.addWidget(new QPushButton);
 
-QGraphicsGridLayout *layout = new QGraphicsGridLayout;
-layout->addItem(textEdit, 0, 0);
-layout->addItem(pushButton, 0, 1);
-
 QGraphicsWidget *form = new QGraphicsWidget;
-form->setLayout(layout);
 scene.addItem(form);
+
+QGraphicsGridLayout *layout = new QGraphicsGridLayout(form);
+layout->addItem(textEdit, 0, 0);
+layout->addItem(pushButton, 0, 1);
 //! [0]
diff --git a/src/widgets/doc/snippets/code/src_gui_graphicsview_qgraphicslinearlayout.cpp b/src/widgets/doc/snippets/code/src_gui_graphicsview_qgraphicslinearlayout.cpp
index 8632fa9037..cc3b1678d0 100644
--- a/src/widgets/doc/snippets/code/src_gui_graphicsview_qgraphicslinearlayout.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_graphicsview_qgraphicslinearlayout.cpp
@@ -6,11 +6,10 @@ QGraphicsScene scene;
 QGraphicsWidget *textEdit = scene.addWidget(new QTextEdit);
 QGraphicsWidget *pushButton = scene.addWidget(new QPushButton);
 
-QGraphicsLinearLayout *layout = new QGraphicsLinearLayout;
-layout->addItem(textEdit);
-layout->addItem(pushButton);
-
 QGraphicsWidget *form = new QGraphicsWidget;
-form->setLayout(layout);
 scene.addItem(form);
+
+QGraphicsLinearLayout *layout = new QGraphicsLinearLayout(form);
+layout->addItem(textEdit);
+layout->addItem(pushButton);
 //! [0]
diff --git a/src/widgets/doc/snippets/code/src_gui_graphicsview_qgraphicsproxywidget.cpp b/src/widgets/doc/snippets/code/src_gui_graphicsview_qgraphicsproxywidget.cpp
index b57a6f0e83..b8cb7b493c 100644
--- a/src/widgets/doc/snippets/code/src_gui_graphicsview_qgraphicsproxywidget.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_graphicsview_qgraphicsproxywidget.cpp
@@ -23,9 +23,8 @@ QGroupBox *groupBox = new QGroupBox("Contact Details");
 QLabel *numberLabel = new QLabel("Telephone number");
 QLineEdit *numberEdit = new QLineEdit;
 
-QFormLayout *layout = new QFormLayout;
+QFormLayout *layout = new QFormLayout(groupBox);
 layout->addRow(numberLabel, numberEdit);
-groupBox->setLayout(layout);
 
 QGraphicsScene scene;
 QGraphicsProxyWidget *proxy = scene.addWidget(groupBox);
diff --git a/src/widgets/doc/snippets/code/src_gui_kernel_qformlayout.cpp b/src/widgets/doc/snippets/code/src_gui_kernel_qformlayout.cpp
index 67dc4556ae..ab20b9da2e 100644
--- a/src/widgets/doc/snippets/code/src_gui_kernel_qformlayout.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_kernel_qformlayout.cpp
@@ -2,15 +2,16 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 //! [0]
-QFormLayout *formLayout = new QFormLayout;
+QFormLayout *formLayout = new QFormLayout(this);
 formLayout->addRow(tr("&Name:"), nameLineEdit);
 formLayout->addRow(tr("&Email:"), emailLineEdit);
 formLayout->addRow(tr("&Age:"), ageSpinBox);
-setLayout(formLayout);
 //! [0]
 
 
 //! [1]
+QGridLayout *gridLayout = new QGridLayout(this);
+
 nameLabel = new QLabel(tr("&Name:"));
 nameLabel->setBuddy(nameLineEdit);
 
@@ -20,14 +21,12 @@ emailLabel->setBuddy(emailLineEdit);
 ageLabel = new QLabel(tr("&Name:"));
 ageLabel->setBuddy(ageSpinBox);
 
-QGridLayout *gridLayout = new QGridLayout;
 gridLayout->addWidget(nameLabel, 0, 0);
 gridLayout->addWidget(nameLineEdit, 0, 1);
 gridLayout->addWidget(emailLabel, 1, 0);
 gridLayout->addWidget(emailLineEdit, 1, 1);
 gridLayout->addWidget(ageLabel, 2, 0);
 gridLayout->addWidget(ageSpinBox, 2, 1);
-setLayout(gridLayout);
 //! [1]
 
 
diff --git a/src/widgets/doc/snippets/mainwindowsnippet.cpp b/src/widgets/doc/snippets/mainwindowsnippet.cpp
index f26b66f2cc..5608dc96ba 100644
--- a/src/widgets/doc/snippets/mainwindowsnippet.cpp
+++ b/src/widgets/doc/snippets/mainwindowsnippet.cpp
@@ -41,9 +41,8 @@ void MainWindow::createToolBars()
 void MainWindow::createDockWidgets()
 {
     QWidget *dockWidgetContents = new QWidget;
-    QVBoxLayout *layout = new QVBoxLayout;
+    QVBoxLayout *layout = new QVBoxLayout(dockWidgetContents);
     layout->addWidget(new QPushButton("My Button."));
-    dockWidgetContents->setLayout(layout);
 
 //! [0]
     QDockWidget *dockWidget = new QDockWidget(tr("Dock Widget"), this);