From ff2ed7d94b08130abef9db8ab38169e1778598f3 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Wed, 31 May 2023 08:47:33 +0200
Subject: [PATCH] CppCheck: Move to simpler setLayouter calls

Change-Id: Id0e9f1adfe730f6067ade9472db597e3a12fc2e3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/cppcheck/cppcheckoptions.cpp | 8 ++++----
 src/plugins/cppcheck/cppcheckoptions.h   | 2 +-
 src/plugins/cppcheck/cppcheckplugin.cpp  | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/plugins/cppcheck/cppcheckoptions.cpp b/src/plugins/cppcheck/cppcheckoptions.cpp
index 8392f64600c..1289ba0e0e2 100644
--- a/src/plugins/cppcheck/cppcheckoptions.cpp
+++ b/src/plugins/cppcheck/cppcheckoptions.cpp
@@ -108,11 +108,11 @@ CppcheckOptions::CppcheckOptions()
     readSettings();
 }
 
-std::function<void(QWidget *widget)> CppcheckOptions::layouter()
+std::function<Layouting::LayoutItem()> CppcheckOptions::layouter()
 {
-    return [this](QWidget *widget) {
+    return [this] {
         using namespace Layouting;
-        Form {
+        return Form {
             binary, br,
             Tr::tr("Checks:"), Flow {
                 warning,
@@ -132,7 +132,7 @@ std::function<void(QWidget *widget)> CppcheckOptions::layouter()
                 addIncludePaths,
                 guessArguments
             }
-        }.attachTo(widget);
+        };
     };
 }
 
diff --git a/src/plugins/cppcheck/cppcheckoptions.h b/src/plugins/cppcheck/cppcheckoptions.h
index a6ccdd98ba0..eb3e1c7ddbf 100644
--- a/src/plugins/cppcheck/cppcheckoptions.h
+++ b/src/plugins/cppcheck/cppcheckoptions.h
@@ -12,7 +12,7 @@ class CppcheckOptions final : public Core::PagedSettings
 public:
     CppcheckOptions();
 
-    std::function<void(QWidget *widget)> layouter();
+    std::function<Layouting::LayoutItem()> layouter();
 
     Utils::FilePathAspect binary{this};
     Utils::BoolAspect warning{this};
diff --git a/src/plugins/cppcheck/cppcheckplugin.cpp b/src/plugins/cppcheck/cppcheckplugin.cpp
index 890e2e3c0ad..b025762c8c6 100644
--- a/src/plugins/cppcheck/cppcheckplugin.cpp
+++ b/src/plugins/cppcheck/cppcheckplugin.cpp
@@ -25,6 +25,7 @@
 #include <debugger/analyzer/analyzerconstants.h>
 #include <debugger/debuggermainwindow.h>
 
+#include <utils/layoutbuilder.h>
 #include <utils/qtcassert.h>
 #include <utils/utilsicons.h>
 
@@ -111,8 +112,7 @@ void CppcheckPluginPrivate::startManualRun()
 
     manualRunTool.updateOptions();
 
-    auto optionsWidget = new QWidget;
-    options.layouter()(optionsWidget);
+    auto optionsWidget = options.layouter()().emerge();
 
     ManualRunDialog dialog(optionsWidget, project);
     if (dialog.exec() == ManualRunDialog::Rejected)