From 1f59f42287b92c022aaace92907c7442c1a01b45 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Fri, 18 Nov 2022 09:02:15 +0100
Subject: [PATCH] Remove unused includes of QLayout

Change-Id: I12777e07f3d6fcc639b48f02080e73b1a0a3ea30
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/coreplugin/welcomepagehelper.cpp               | 2 +-
 src/plugins/git/changeselectiondialog.cpp                  | 1 -
 .../nim/settings/nimcodestylepreferencesfactory.cpp        | 1 -
 src/plugins/perforce/perforceeditor.cpp                    | 1 -
 src/plugins/projectexplorer/buildaspects.cpp               | 2 --
 src/plugins/projectexplorer/kitmodel.cpp                   | 2 +-
 .../components/annotationeditor/annotationlistwidget.cpp   | 1 -
 src/plugins/qmldesigner/designmodewidget.cpp               | 3 ---
 .../qmljstools/qmljscodestylepreferencesfactory.cpp        | 3 ---
 .../cmakegen/cmakeprojectconverterdialog.cpp               | 1 -
 src/plugins/qtsupport/qtbuildaspects.cpp                   | 1 -
 src/plugins/scxmleditor/outputpane/errorwidget.cpp         | 2 +-
 src/shared/designerintegrationv2/formresizer.cpp           | 6 +++---
 src/shared/designerintegrationv2/widgethost.cpp            | 7 +++----
 src/shared/help/contentwindow.cpp                          | 2 +-
 .../widgets/infolabel/tst_manual_widgets_infolabel.cpp     | 1 -
 16 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/src/plugins/coreplugin/welcomepagehelper.cpp b/src/plugins/coreplugin/welcomepagehelper.cpp
index fbcda0e4d0c..372f0496520 100644
--- a/src/plugins/coreplugin/welcomepagehelper.cpp
+++ b/src/plugins/coreplugin/welcomepagehelper.cpp
@@ -12,8 +12,8 @@
 #include <QEasingCurve>
 #include <QFontDatabase>
 #include <QHeaderView>
+#include <QHBoxLayout>
 #include <QHoverEvent>
-#include <QLayout>
 #include <QMouseEvent>
 #include <QPainter>
 #include <QPixmapCache>
diff --git a/src/plugins/git/changeselectiondialog.cpp b/src/plugins/git/changeselectiondialog.cpp
index 174576707f5..18aaf5778f6 100644
--- a/src/plugins/git/changeselectiondialog.cpp
+++ b/src/plugins/git/changeselectiondialog.cpp
@@ -18,7 +18,6 @@
 #include <QCompleter>
 #include <QFileDialog>
 #include <QLabel>
-#include <QLayout>
 #include <QLineEdit>
 #include <QPlainTextEdit>
 #include <QPushButton>
diff --git a/src/plugins/nim/settings/nimcodestylepreferencesfactory.cpp b/src/plugins/nim/settings/nimcodestylepreferencesfactory.cpp
index 59f534d816c..415a1f26cb0 100644
--- a/src/plugins/nim/settings/nimcodestylepreferencesfactory.cpp
+++ b/src/plugins/nim/settings/nimcodestylepreferencesfactory.cpp
@@ -13,7 +13,6 @@
 #include <texteditor/simplecodestylepreferences.h>
 
 #include <QWidget>
-#include <QLayout>
 
 using namespace TextEditor;
 
diff --git a/src/plugins/perforce/perforceeditor.cpp b/src/plugins/perforce/perforceeditor.cpp
index 03af097fda9..d0c7af18f5b 100644
--- a/src/plugins/perforce/perforceeditor.cpp
+++ b/src/plugins/perforce/perforceeditor.cpp
@@ -17,7 +17,6 @@
 
 #include <QAction>
 #include <QKeyEvent>
-#include <QLayout>
 #include <QMenu>
 #include <QTextCursor>
 #include <QTextEdit>
diff --git a/src/plugins/projectexplorer/buildaspects.cpp b/src/plugins/projectexplorer/buildaspects.cpp
index 383149d3b70..20a23298a2e 100644
--- a/src/plugins/projectexplorer/buildaspects.cpp
+++ b/src/plugins/projectexplorer/buildaspects.cpp
@@ -19,8 +19,6 @@
 #include <utils/layoutbuilder.h>
 #include <utils/pathchooser.h>
 
-#include <QLayout>
-
 using namespace Utils;
 
 namespace ProjectExplorer {
diff --git a/src/plugins/projectexplorer/kitmodel.cpp b/src/plugins/projectexplorer/kitmodel.cpp
index 25ef46f5867..7846787695e 100644
--- a/src/plugins/projectexplorer/kitmodel.cpp
+++ b/src/plugins/projectexplorer/kitmodel.cpp
@@ -13,7 +13,7 @@
 #include <utils/utilsicons.h>
 
 #include <QApplication>
-#include <QLayout>
+#include <QBoxLayout>
 
 using namespace Utils;
 
diff --git a/src/plugins/qmldesigner/components/annotationeditor/annotationlistwidget.cpp b/src/plugins/qmldesigner/components/annotationeditor/annotationlistwidget.cpp
index 4f037ce8daa..b73d4a9c71b 100644
--- a/src/plugins/qmldesigner/components/annotationeditor/annotationlistwidget.cpp
+++ b/src/plugins/qmldesigner/components/annotationeditor/annotationlistwidget.cpp
@@ -6,7 +6,6 @@
 #include "annotationeditorwidget.h"
 #include "annotationlist.h"
 
-#include <QLayout>
 #include <QHBoxLayout>
 
 namespace QmlDesigner {
diff --git a/src/plugins/qmldesigner/designmodewidget.cpp b/src/plugins/qmldesigner/designmodewidget.cpp
index 574c7cf3651..5181d8826d7 100644
--- a/src/plugins/qmldesigner/designmodewidget.cpp
+++ b/src/plugins/qmldesigner/designmodewidget.cpp
@@ -7,8 +7,6 @@
 
 #include "qmldesignerplugin.h"
 #include "crumblebar.h"
-#include "documentwarningwidget.h"
-#include "edit3dview.h"
 
 #include <texteditor/textdocument.h>
 #include <nodeinstanceview.h>
@@ -43,7 +41,6 @@
 #include <QBoxLayout>
 #include <QComboBox>
 #include <QDir>
-#include <QLayout>
 #include <QSettings>
 #include <QToolBar>
 
diff --git a/src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp b/src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp
index 4c546e3348f..784ee870bd7 100644
--- a/src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp
+++ b/src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp
@@ -8,11 +8,8 @@
 #include "qmljsindenter.h"
 #include "qmljstoolsconstants.h"
 
-
 #include <qmljseditor/qmljseditorconstants.h>
 
-#include <QLayout>
-
 using namespace QmlJSTools;
 
 static const char *defaultPreviewText =
diff --git a/src/plugins/qmlprojectmanager/cmakegen/cmakeprojectconverterdialog.cpp b/src/plugins/qmlprojectmanager/cmakegen/cmakeprojectconverterdialog.cpp
index 1971e4f84aa..8cb8cd6e2ee 100644
--- a/src/plugins/qmlprojectmanager/cmakegen/cmakeprojectconverterdialog.cpp
+++ b/src/plugins/qmlprojectmanager/cmakegen/cmakeprojectconverterdialog.cpp
@@ -10,7 +10,6 @@
 #include <QFormLayout>
 #include <QGroupBox>
 #include <QLabel>
-#include <QLayout>
 #include <QPushButton>
 #include <QRegularExpression>
 
diff --git a/src/plugins/qtsupport/qtbuildaspects.cpp b/src/plugins/qtsupport/qtbuildaspects.cpp
index e87a1abda4b..59b16b3ed9f 100644
--- a/src/plugins/qtsupport/qtbuildaspects.cpp
+++ b/src/plugins/qtsupport/qtbuildaspects.cpp
@@ -16,7 +16,6 @@
 #include <utils/qtcassert.h>
 
 #include <QCheckBox>
-#include <QLayout>
 
 using namespace ProjectExplorer;
 using namespace Utils;
diff --git a/src/plugins/scxmleditor/outputpane/errorwidget.cpp b/src/plugins/scxmleditor/outputpane/errorwidget.cpp
index f907ae8faba..2afe224235b 100644
--- a/src/plugins/scxmleditor/outputpane/errorwidget.cpp
+++ b/src/plugins/scxmleditor/outputpane/errorwidget.cpp
@@ -6,10 +6,10 @@
 #include "scxmleditortr.h"
 #include "tableview.h"
 
-#include <QLayout>
 #include <QFile>
 #include <QFileDialog>
 #include <QHeaderView>
+#include <QLayout>
 #include <QMessageBox>
 #include <QSortFilterProxyModel>
 #include <QTextStream>
diff --git a/src/shared/designerintegrationv2/formresizer.cpp b/src/shared/designerintegrationv2/formresizer.cpp
index 31634cb8822..cdc31448df6 100644
--- a/src/shared/designerintegrationv2/formresizer.cpp
+++ b/src/shared/designerintegrationv2/formresizer.cpp
@@ -9,10 +9,10 @@
 
 #include <QDesignerFormWindowInterface>
 
-#include <QResizeEvent>
-#include <QPalette>
-#include <QLayout>
 #include <QFrame>
+#include <QPalette>
+#include <QResizeEvent>
+#include <QVBoxLayout>
 
 enum { debugFormResizer = 0 };
 
diff --git a/src/shared/designerintegrationv2/widgethost.cpp b/src/shared/designerintegrationv2/widgethost.cpp
index 25719108b88..0175581e9b1 100644
--- a/src/shared/designerintegrationv2/widgethost.cpp
+++ b/src/shared/designerintegrationv2/widgethost.cpp
@@ -8,11 +8,10 @@
 #include <QDesignerFormWindowInterface>
 #include <QDesignerFormWindowCursorInterface>
 
-#include <QPalette>
-#include <QLayout>
-#include <QFrame>
-#include <QResizeEvent>
 #include <QDebug>
+#include <QFrame>
+#include <QPalette>
+#include <QResizeEvent>
 
 using namespace SharedTools;
 
diff --git a/src/shared/help/contentwindow.cpp b/src/shared/help/contentwindow.cpp
index 75bf8073b5a..ac140f8a9a6 100644
--- a/src/shared/help/contentwindow.cpp
+++ b/src/shared/help/contentwindow.cpp
@@ -9,9 +9,9 @@
 
 #include <utils/navigationtreeview.h>
 
-#include <QLayout>
 #include <QFocusEvent>
 #include <QMenu>
+#include <QVBoxLayout>
 
 #include <QHelpEngine>
 #include <QHelpContentModel>
diff --git a/tests/manual/widgets/infolabel/tst_manual_widgets_infolabel.cpp b/tests/manual/widgets/infolabel/tst_manual_widgets_infolabel.cpp
index a522b379131..78d8e5a2f37 100644
--- a/tests/manual/widgets/infolabel/tst_manual_widgets_infolabel.cpp
+++ b/tests/manual/widgets/infolabel/tst_manual_widgets_infolabel.cpp
@@ -5,7 +5,6 @@
 
 #include <QApplication>
 #include <QFormLayout>
-#include <QLayout>
 #include <QMessageBox>
 #include <QSettings>