From 2390c8170e58afc1001472261cfb732b4bbb701c Mon Sep 17 00:00:00 2001
From: Withalion <matej.bagar@lutraconsulting.co.uk>
Date: Tue, 18 Feb 2025 12:56:00 +0100
Subject: [PATCH] Refactor includes

---
 .../auto_generated/qgscameracontroller.sip.in |  1 -
 .../auto_generated/qgscameracontroller.sip.in |  1 -
 src/3d/qgs3dmapcanvas.cpp                     |  3 --
 src/3d/qgs3dutils.h                           | 29 +++++++++----------
 src/3d/qgscameracontroller.h                  |  3 +-
 src/3d/qgsframegraph.cpp                      |  3 --
 src/3d/qgsrubberband3d.cpp                    | 10 +++----
 src/3d/qgsrubberband3d.h                      |  7 ++---
 src/app/3d/qgs3dmapcanvaswidget.h             |  2 --
 9 files changed, 21 insertions(+), 38 deletions(-)

diff --git a/python/3d/auto_generated/qgscameracontroller.sip.in b/python/3d/auto_generated/qgscameracontroller.sip.in
index 3ae4e55af5aa..2b93326740af 100644
--- a/python/3d/auto_generated/qgscameracontroller.sip.in
+++ b/python/3d/auto_generated/qgscameracontroller.sip.in
@@ -12,7 +12,6 @@
 
 
 
-
 class QgsCameraController : QObject
 {
 %Docstring(signature="appended")
diff --git a/python/PyQt6/3d/auto_generated/qgscameracontroller.sip.in b/python/PyQt6/3d/auto_generated/qgscameracontroller.sip.in
index 3ae4e55af5aa..2b93326740af 100644
--- a/python/PyQt6/3d/auto_generated/qgscameracontroller.sip.in
+++ b/python/PyQt6/3d/auto_generated/qgscameracontroller.sip.in
@@ -12,7 +12,6 @@
 
 
 
-
 class QgsCameraController : QObject
 {
 %Docstring(signature="appended")
diff --git a/src/3d/qgs3dmapcanvas.cpp b/src/3d/qgs3dmapcanvas.cpp
index 2057340c76b7..7315a31d8225 100644
--- a/src/3d/qgs3dmapcanvas.cpp
+++ b/src/3d/qgs3dmapcanvas.cpp
@@ -14,17 +14,14 @@
  ***************************************************************************/
 
 #include <Qt3DCore/QAspectEngine>
-#include <Qt3DCore/QEntity>
 #if QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 )
 #include <Qt3DCore/QCoreAspect>
 #endif
-#include <Qt3DExtras/QForwardRenderer>
 #include <Qt3DRender/QRenderSettings>
 #include <Qt3DRender/QRenderAspect>
 #include <Qt3DInput/QInputAspect>
 #include <Qt3DInput/QInputSettings>
 #include <Qt3DLogic/QLogicAspect>
-#include <Qt3DRender/QCamera>
 #include <Qt3DLogic/QFrameAction>
 
 #include "qgs3dmapcanvas.h"
diff --git a/src/3d/qgs3dutils.h b/src/3d/qgs3dutils.h
index 8984273888b8..aa7af6803472 100644
--- a/src/3d/qgs3dutils.h
+++ b/src/3d/qgs3dutils.h
@@ -15,7 +15,20 @@
 
 #ifndef QGS3DUTILS_H
 #define QGS3DUTILS_H
+#define SIP_NO_FILE
+
 #include "qgs3dmapcanvas.h"
+#include "qgs3dmapsettings.h"
+#include "qgs3danimationsettings.h"
+#include "qgs3dtypes.h"
+#include "qgsaabb.h"
+#include "qgsray3d.h"
+#include "qgsraycastingutils.h"
+
+#include <Qt3DRender/QCamera>
+#include <Qt3DRender/QCullFace>
+
+#include <memory>
 
 class QgsLineString;
 class QgsPolygon;
@@ -33,22 +46,6 @@ namespace Qt3DExtras
 }
 
 class QSurface;
-
-#include "qgs3dmapsettings.h"
-#include "qgs3danimationsettings.h"
-#include "qgs3dtypes.h"
-#include "qgsaabb.h"
-#include "qgsray3d.h"
-#include "qgsraycastingutils.h"
-
-#include <QSize>
-#include <Qt3DRender/QCamera>
-#include <Qt3DRender/QCullFace>
-
-#include <memory>
-
-#define SIP_NO_FILE
-
 class Qgs3DRenderContext;
 
 /**
diff --git a/src/3d/qgscameracontroller.h b/src/3d/qgscameracontroller.h
index bd6121991019..cae08703a53d 100644
--- a/src/3d/qgscameracontroller.h
+++ b/src/3d/qgscameracontroller.h
@@ -17,6 +17,7 @@
 #define QGSCAMERACONTROLLER_H
 
 #include "qgis_3d.h"
+#include "qgscamerapose.h"
 
 #include <Qt3DCore/QEntity>
 #include <Qt3DInput/QMouseEvent>
@@ -39,8 +40,6 @@ namespace Qt3DRender
 
 #endif
 
-#include "qgscamerapose.h"
-
 class QDomDocument;
 class QDomElement;
 
diff --git a/src/3d/qgsframegraph.cpp b/src/3d/qgsframegraph.cpp
index 373d34f80ba8..f94ecbd9b502 100644
--- a/src/3d/qgsframegraph.cpp
+++ b/src/3d/qgsframegraph.cpp
@@ -46,11 +46,8 @@ typedef Qt3DCore::QGeometry Qt3DQGeometry;
 #include <Qt3DRender/QBlendEquation>
 #include <Qt3DRender/QColorMask>
 #include <Qt3DRender/QSortPolicy>
-#include <Qt3DRender/QPointSize>
-#include <Qt3DRender/QSeamlessCubemap>
 #include <Qt3DRender/QNoDepthMask>
 #include <Qt3DRender/QBlendEquationArguments>
-#include <Qt3DExtras/QTextureMaterial>
 #include <Qt3DRender/QAbstractTexture>
 #include "qgsfgutils.h"
 #include <Qt3DRender/QNoDraw>
diff --git a/src/3d/qgsrubberband3d.cpp b/src/3d/qgsrubberband3d.cpp
index f33bb8393267..80d519f4d4cd 100644
--- a/src/3d/qgsrubberband3d.cpp
+++ b/src/3d/qgsrubberband3d.cpp
@@ -25,8 +25,9 @@
 #include "qgslinestring.h"
 #include "qgssymbollayer.h"
 #include "qgs3dmapsettings.h"
-
-#include <Qt3DCore/QEntity>
+#include "qgs3dutils.h"
+#include "qgsmessagelog.h"
+#include "qgstessellatedpolygongeometry.h"
 
 #if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 )
 #include <Qt3DRender/QAttribute>
@@ -38,10 +39,7 @@
 #include <Qt3DCore/QGeometry>
 #endif
 
-#include "qgs3dutils.h"
-#include "qgsmessagelog.h"
-#include "qgstessellatedpolygongeometry.h"
-
+#include <Qt3DCore/QEntity>
 #include <Qt3DRender/QGeometryRenderer>
 #include <QColor>
 
diff --git a/src/3d/qgsrubberband3d.h b/src/3d/qgsrubberband3d.h
index 3a9dae0a3a34..b9243e2a262b 100644
--- a/src/3d/qgsrubberband3d.h
+++ b/src/3d/qgsrubberband3d.h
@@ -16,10 +16,6 @@
 #ifndef QGSRUBBERBAND3D_H
 #define QGSRUBBERBAND3D_H
 
-#include "qgis_3d.h"
-
-#include <QColor>
-
 #define SIP_NO_FILE
 
 /// @cond PRIVATE
@@ -33,10 +29,13 @@
 // version without notice, or even be removed.
 //
 
+#include "qgis_3d.h"
 #include "qgslinestring.h"
 #include "qgspolygon.h"
 #include "qgstessellator.h"
 
+#include <QColor>
+
 class QgsPhongMaterialSettings;
 class QgsMaterial;
 class QgsTessellatedPolygonGeometry;
diff --git a/src/app/3d/qgs3dmapcanvaswidget.h b/src/app/3d/qgs3dmapcanvaswidget.h
index 16ca4b27b348..b1a5e503fd2c 100644
--- a/src/app/3d/qgs3dmapcanvaswidget.h
+++ b/src/app/3d/qgs3dmapcanvaswidget.h
@@ -16,7 +16,6 @@
 #ifndef QGS3DMAPCANVASWIDGET_H
 #define QGS3DMAPCANVASWIDGET_H
 
-#include "qgsdockwidget.h"
 #include "qgis_app.h"
 #include "qobjectuniqueptr.h"
 #include "qgsrectangle.h"
@@ -24,7 +23,6 @@
 #include <QComboBox>
 #include <QMenu>
 #include <QPointer>
-#include <QToolButton>
 #include <QToolBar>
 
 #define SIP_NO_FILE