From d60aa6a8cf8b020c2ae8e6a8bb45311acce8cab9 Mon Sep 17 00:00:00 2001 From: Ahmad Samir Date: Tue, 10 Nov 2020 20:30:49 +0200 Subject: Layouts docs: pass parent widget in the ctor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- src/gui/doc/snippets/separations/finalwidget.cpp | 3 +-- src/gui/doc/snippets/separations/screenwidget.cpp | 3 +-- src/gui/doc/snippets/transform/main.cpp | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) (limited to 'src/gui/doc') diff --git a/src/gui/doc/snippets/separations/finalwidget.cpp b/src/gui/doc/snippets/separations/finalwidget.cpp index a3d60cfc83..3c308d9df8 100644 --- a/src/gui/doc/snippets/separations/finalwidget.cpp +++ b/src/gui/doc/snippets/separations/finalwidget.cpp @@ -28,10 +28,9 @@ FinalWidget::FinalWidget(QWidget *parent, const QString &name, imageLabel->setMinimumSize(labelSize); nameLabel = new QLabel(name); - QVBoxLayout *layout = new QVBoxLayout; + QVBoxLayout *layout = new QVBoxLayout(this); layout->addWidget(imageLabel, 1); layout->addWidget(nameLabel, 0); - setLayout(layout); } /*! diff --git a/src/gui/doc/snippets/separations/screenwidget.cpp b/src/gui/doc/snippets/separations/screenwidget.cpp index 87a6c9e605..223de95962 100644 --- a/src/gui/doc/snippets/separations/screenwidget.cpp +++ b/src/gui/doc/snippets/separations/screenwidget.cpp @@ -61,12 +61,11 @@ ScreenWidget::ScreenWidget(QWidget *parent, QColor initialColor, connect(colorButton, &QPushButton::clicked, this, &ScreenWidget::setColor); connect(invertButton, &QPushButton::clicked, this, &ScreenWidget::invertImage); - QGridLayout *gridLayout = new QGridLayout; + QGridLayout *gridLayout = new QGridLayout(this); gridLayout->addWidget(imageLabel, 0, 0, 1, 2); gridLayout->addWidget(nameLabel, 1, 0); gridLayout->addWidget(colorButton, 1, 1); gridLayout->addWidget(invertButton, 2, 1, 1, 1); - setLayout(gridLayout); } /*! diff --git a/src/gui/doc/snippets/transform/main.cpp b/src/gui/doc/snippets/transform/main.cpp index 56d6780269..cedffe218c 100644 --- a/src/gui/doc/snippets/transform/main.cpp +++ b/src/gui/doc/snippets/transform/main.cpp @@ -91,11 +91,10 @@ int main(int argc, char **argv) CombinedTransformation *combinedWidget = new CombinedTransformation; BasicOperations *basicWidget = new BasicOperations; - QVBoxLayout *layout = new QVBoxLayout; + QVBoxLayout *layout = new QVBoxLayout(&widget); layout->addWidget(simpleWidget); layout->addWidget(combinedWidget); layout->addWidget(basicWidget); - widget.setLayout(layout); widget.show(); widget.resize(130, 350); -- cgit v1.2.3