Cleanup: sort struct declarations

35 files changed, 46 insertions, 46 deletions

diff --git a/intern/ghost/intern/GHOST_WindowWayland.h b/intern/ghost/intern/GHOST_WindowWayland.h
index 6ffcf99b48c..afbdf1268ee 100644
--- a/intern/ghost/intern/GHOST_WindowWayland.h
+++ b/intern/ghost/intern/GHOST_WindowWayland.h
@@ -29,9 +29,9 @@
 
 class GHOST_SystemWayland;
 
+struct output_t;
 struct window_t;
 struct wl_surface;
-struct output_t;
 
 class GHOST_WindowWayland : public GHOST_Window {
  public:
diff --git a/source/blender/blenkernel/BKE_armature.h b/source/blender/blenkernel/BKE_armature.h
index 1f9e304c7a3..e13475fd78c 100644
--- a/source/blender/blenkernel/BKE_armature.h
+++ b/source/blender/blenkernel/BKE_armature.h
@@ -28,7 +28,6 @@ extern "C" {
 #endif
 
 struct AnimationEvalContext;
-struct bAction;
 struct BMEditMesh;
 struct Bone;
 struct Depsgraph;
@@ -39,6 +38,7 @@ struct Mesh;
 struct Object;
 struct PoseTree;
 struct Scene;
+struct bAction;
 struct bArmature;
 struct bConstraint;
 struct bGPDstroke;
diff --git a/source/blender/blenkernel/BKE_deform.h b/source/blender/blenkernel/BKE_deform.h
index 0ab126a70ae..f4221d57428 100644
--- a/source/blender/blenkernel/BKE_deform.h
+++ b/source/blender/blenkernel/BKE_deform.h
@@ -30,6 +30,7 @@ extern "C" {
 
 struct BlendDataReader;
 struct BlendWriter;
+struct ID;
 struct ListBase;
 struct MDeformVert;
 struct MEdge;
@@ -37,7 +38,6 @@ struct MLoop;
 struct MPoly;
 struct Object;
 struct bDeformGroup;
-struct ID;
 
 bool BKE_object_supports_vertex_groups(const struct Object *ob);
 const struct ListBase *BKE_object_defgroup_list(const struct Object *ob);
diff --git a/source/blender/blenkernel/BKE_editmesh.h b/source/blender/blenkernel/BKE_editmesh.h
index ce7df62389f..ffd8ac42c63 100644
--- a/source/blender/blenkernel/BKE_editmesh.h
+++ b/source/blender/blenkernel/BKE_editmesh.h
@@ -32,8 +32,8 @@ extern "C" {
 #endif
 
 struct BMLoop;
-struct BMesh;
 struct BMPartialUpdate;
+struct BMesh;
 struct BMeshCalcTessellation_Params;
 struct BoundBox;
 struct Depsgraph;
diff --git a/source/blender/blenkernel/BKE_geometry_set.hh b/source/blender/blenkernel/BKE_geometry_set.hh
index 77e827bf6f2..42e9ce82278 100644
--- a/source/blender/blenkernel/BKE_geometry_set.hh
+++ b/source/blender/blenkernel/BKE_geometry_set.hh
@@ -35,12 +35,12 @@
 #include "BKE_geometry_set.h"
 
 struct Collection;
+struct Curve;
+struct CurveEval;
 struct Mesh;
 struct Object;
 struct PointCloud;
 struct Volume;
-struct Curve;
-struct CurveEval;
 
 enum class GeometryOwnershipType {
   /* The geometry is owned. This implies that it can be changed. */
diff --git a/source/blender/blenkernel/BKE_lib_override.h b/source/blender/blenkernel/BKE_lib_override.h
index 27076d908e7..c6658ff424a 100644
--- a/source/blender/blenkernel/BKE_lib_override.h
+++ b/source/blender/blenkernel/BKE_lib_override.h
@@ -42,8 +42,8 @@
 extern "C" {
 #endif
 
-struct Collection;
 struct BlendFileReadReport;
+struct Collection;
 struct ID;
 struct IDOverrideLibrary;
 struct IDOverrideLibraryProperty;
diff --git a/source/blender/bmesh/intern/bmesh_mesh.h b/source/blender/bmesh/intern/bmesh_mesh.h
index 456275cf157..bd0504b038a 100644
--- a/source/blender/bmesh/intern/bmesh_mesh.h
+++ b/source/blender/bmesh/intern/bmesh_mesh.h
@@ -24,8 +24,8 @@
 
 struct BMAllocTemplate;
 struct BMLoopNorEditDataArray;
-struct MLoopNorSpaceArray;
 struct BMPartialUpdate;
+struct MLoopNorSpaceArray;
 
 void BM_mesh_elem_toolflags_ensure(BMesh *bm);
 void BM_mesh_elem_toolflags_clear(BMesh *bm);
diff --git a/source/blender/bmesh/intern/bmesh_polygon.h b/source/blender/bmesh/intern/bmesh_polygon.h
index 2c32cd39002..5be7f4a5f3b 100644
--- a/source/blender/bmesh/intern/bmesh_polygon.h
+++ b/source/blender/bmesh/intern/bmesh_polygon.h
@@ -20,8 +20,8 @@
  * \ingroup bmesh
  */
 
-struct Heap;
 struct BMPartialUpdate;
+struct Heap;
 
 #include "BLI_compiler_attrs.h"
 
diff --git a/source/blender/depsgraph/DEG_depsgraph_build.h b/source/blender/depsgraph/DEG_depsgraph_build.h
index 42c9cccceed..c029d203574 100644
--- a/source/blender/depsgraph/DEG_depsgraph_build.h
+++ b/source/blender/depsgraph/DEG_depsgraph_build.h
@@ -33,6 +33,7 @@ struct Depsgraph;
 /* ------------------------------------------------ */
 
 struct CacheFile;
+struct Collection;
 struct CustomData_MeshMasks;
 struct ID;
 struct Main;
@@ -40,7 +41,6 @@ struct Object;
 struct Scene;
 struct Simulation;
 struct bNodeTree;
-struct Collection;
 
 #include "BLI_sys_types.h"
 
diff --git a/source/blender/editors/include/ED_anim_api.h b/source/blender/editors/include/ED_anim_api.h
index 5cf2a9c9dd0..50e53acb376 100644
--- a/source/blender/editors/include/ED_anim_api.h
+++ b/source/blender/editors/include/ED_anim_api.h
@@ -34,9 +34,9 @@ struct ListBase;
 
 struct ARegion;
 struct ARegionType;
+struct FModifier;
 struct Main;
 struct NlaStrip;
-struct FModifier;
 struct PanelType;
 struct ReportList;
 struct ScrArea;
diff --git a/source/blender/editors/include/ED_armature.h b/source/blender/editors/include/ED_armature.h
index 51d8aa8b064..868235c36e5 100644
--- a/source/blender/editors/include/ED_armature.h
+++ b/source/blender/editors/include/ED_armature.h
@@ -31,7 +31,6 @@
 extern "C" {
 #endif
 
-struct bAction;
 struct Base;
 struct Bone;
 struct Depsgraph;
@@ -46,6 +45,7 @@ struct Scene;
 struct UndoType;
 struct View3D;
 struct ViewLayer;
+struct bAction;
 struct bArmature;
 struct bContext;
 struct bPoseChannel;
diff --git a/source/blender/editors/include/ED_asset.h b/source/blender/editors/include/ED_asset.h
index d33085f1cc4..0058c0615c3 100644
--- a/source/blender/editors/include/ED_asset.h
+++ b/source/blender/editors/include/ED_asset.h
@@ -28,9 +28,9 @@ extern "C" {
 
 struct AssetFilterSettings;
 struct AssetLibraryReference;
-struct bContext;
 struct Main;
 struct ReportList;
+struct bContext;
 struct wmNotifier;
 
 typedef struct AssetTempIDConsumer AssetTempIDConsumer;
diff --git a/source/blender/editors/include/ED_node.h b/source/blender/editors/include/ED_node.h
index 058d4fa91a3..6e4002fcc0a 100644
--- a/source/blender/editors/include/ED_node.h
+++ b/source/blender/editors/include/ED_node.h
@@ -31,6 +31,7 @@ struct ID;
 struct Main;
 struct Scene;
 struct ScrArea;
+struct SpaceNode;
 struct Tex;
 struct View2D;
 struct bContext;
@@ -40,7 +41,6 @@ struct bNodeSocketType;
 struct bNodeTree;
 struct bNodeTreeType;
 struct bNodeType;
-struct SpaceNode;
 
 typedef enum {
   NODE_TOP = 1,
diff --git a/source/blender/editors/include/ED_particle.h b/source/blender/editors/include/ED_particle.h
index 6d0172e724a..5318c653b6d 100644
--- a/source/blender/editors/include/ED_particle.h
+++ b/source/blender/editors/include/ED_particle.h
@@ -34,9 +34,9 @@ struct ParticleSystem;
 struct Scene;
 struct UndoType;
 struct ViewLayer;
-struct wmGenericUserData;
 struct bContext;
 struct rcti;
+struct wmGenericUserData;
 
 /* particle edit mode */
 void PE_free_ptcache_edit(struct PTCacheEdit *edit);
diff --git a/source/blender/editors/include/ED_spreadsheet.h b/source/blender/editors/include/ED_spreadsheet.h
index ff77135a51c..dfa8aa7bfbc 100644
--- a/source/blender/editors/include/ED_spreadsheet.h
+++ b/source/blender/editors/include/ED_spreadsheet.h
@@ -16,14 +16,14 @@
 
 #pragma once
 
-struct SpreadsheetContext;
-struct SpaceSpreadsheet;
-struct SpaceNode;
 struct ID;
-struct bNode;
 struct Main;
-struct bContext;
 struct Object;
+struct SpaceNode;
+struct SpaceSpreadsheet;
+struct SpreadsheetContext;
+struct bContext;
+struct bNode;
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/editors/io/io_gpencil.h b/source/blender/editors/io/io_gpencil.h
index b347be00412..428b09f0e9c 100644
--- a/source/blender/editors/io/io_gpencil.h
+++ b/source/blender/editors/io/io_gpencil.h
@@ -25,8 +25,8 @@
  */
 
 struct ARegion;
-struct bContext;
 struct View3D;
+struct bContext;
 struct wmOperatorType;
 
 void WM_OT_gpencil_import_svg(struct wmOperatorType *ot);
diff --git a/source/blender/editors/space_buttons/buttons_intern.h b/source/blender/editors/space_buttons/buttons_intern.h
index 7564fa4b930..9cb363ff0c9 100644
--- a/source/blender/editors/space_buttons/buttons_intern.h
+++ b/source/blender/editors/space_buttons/buttons_intern.h
@@ -34,8 +34,8 @@ struct Tex;
 struct bContext;
 struct bContextDataResult;
 struct bNode;
-struct bNodeTree;
 struct bNodeSocket;
+struct bNodeTree;
 struct wmOperatorType;
 
 struct SpaceProperties_Runtime {
diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_cell_value.hh b/source/blender/editors/space_spreadsheet/spreadsheet_cell_value.hh
index c9b73aabf96..680da9b6794 100644
--- a/source/blender/editors/space_spreadsheet/spreadsheet_cell_value.hh
+++ b/source/blender/editors/space_spreadsheet/spreadsheet_cell_value.hh
@@ -22,8 +22,8 @@
 #include "BLI_float2.hh"
 #include "BLI_float3.hh"
 
-struct Object;
 struct Collection;
+struct Object;
 
 namespace blender::ed::spreadsheet {
 
diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_dataset_draw.hh b/source/blender/editors/space_spreadsheet/spreadsheet_dataset_draw.hh
index d9e6d882c2a..19906d73e7f 100644
--- a/source/blender/editors/space_spreadsheet/spreadsheet_dataset_draw.hh
+++ b/source/blender/editors/space_spreadsheet/spreadsheet_dataset_draw.hh
@@ -23,9 +23,9 @@
 #include "spreadsheet_dataset_layout.hh"
 
 struct ARegion;
-struct uiBlock;
 struct View2D;
 struct bContext;
+struct uiBlock;
 
 namespace blender::ed::spreadsheet {
 
diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_draw.hh b/source/blender/editors/space_spreadsheet/spreadsheet_draw.hh
index 647587ec8b0..9accd1d3d09 100644
--- a/source/blender/editors/space_spreadsheet/spreadsheet_draw.hh
+++ b/source/blender/editors/space_spreadsheet/spreadsheet_draw.hh
@@ -18,9 +18,9 @@
 
 #include "BLI_vector.hh"
 
-struct uiBlock;
-struct bContext;
 struct ARegion;
+struct bContext;
+struct uiBlock;
 
 namespace blender::ed::spreadsheet {
 
diff --git a/source/blender/gpencil_modifiers/intern/lineart/MOD_lineart.h b/source/blender/gpencil_modifiers/intern/lineart/MOD_lineart.h
index 247b0b3f57b..1d4370ed3a9 100644
--- a/source/blender/gpencil_modifiers/intern/lineart/MOD_lineart.h
+++ b/source/blender/gpencil_modifiers/intern/lineart/MOD_lineart.h
@@ -575,9 +575,9 @@ BLI_INLINE int lineart_LineIntersectTest2d(
 }
 
 struct Depsgraph;
-struct Scene;
-struct LineartRenderBuffer;
 struct LineartGpencilModifierData;
+struct LineartRenderBuffer;
+struct Scene;
 
 void MOD_lineart_destroy_render_data(struct LineartGpencilModifierData *lmd);
 
@@ -602,8 +602,8 @@ LineartBoundingArea *MOD_lineart_get_parent_bounding_area(LineartRenderBuffer *r
 
 LineartBoundingArea *MOD_lineart_get_bounding_area(LineartRenderBuffer *rb, double x, double y);
 
-struct bGPDlayer;
 struct bGPDframe;
+struct bGPDlayer;
 
 void MOD_lineart_gpencil_generate(LineartCache *cache,
                                   struct Depsgraph *depsgraph,
diff --git a/source/blender/gpencil_modifiers/intern/lineart/lineart_intern.h b/source/blender/gpencil_modifiers/intern/lineart/lineart_intern.h
index 9d109320f09..70ff4a373dd 100644
--- a/source/blender/gpencil_modifiers/intern/lineart/lineart_intern.h
+++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_intern.h
@@ -33,10 +33,10 @@
 #include <math.h>
 #include <string.h>
 
-struct LineartStaticMemPool;
-struct LineartStaticMemPoolNode;
 struct LineartEdge;
 struct LineartRenderBuffer;
+struct LineartStaticMemPool;
+struct LineartStaticMemPoolNode;
 
 void *lineart_list_append_pointer_pool(ListBase *h, struct LineartStaticMemPool *smp, void *data);
 void *lineart_list_append_pointer_pool_sized(ListBase *h,
diff --git a/source/blender/imbuf/IMB_imbuf.h b/source/blender/imbuf/IMB_imbuf.h
index 2cfce7b1ba0..d527aca184c 100644
--- a/source/blender/imbuf/IMB_imbuf.h
+++ b/source/blender/imbuf/IMB_imbuf.h
@@ -69,8 +69,8 @@ extern "C" {
  * \attention defined in ???
  */
 struct ImBuf;
-struct rcti;
 struct rctf;
+struct rcti;
 
 /**
  *
diff --git a/source/blender/io/gpencil/gpencil_io.h b/source/blender/io/gpencil/gpencil_io.h
index 24b13479359..fab867b38b3 100644
--- a/source/blender/io/gpencil/gpencil_io.h
+++ b/source/blender/io/gpencil/gpencil_io.h
@@ -27,9 +27,9 @@ extern "C" {
 #endif
 
 struct ARegion;
-struct bContext;
 struct Object;
 struct View3D;
+struct bContext;
 
 typedef struct GpencilIOParams {
   bContext *C;
diff --git a/source/blender/io/gpencil/intern/gpencil_io_base.hh b/source/blender/io/gpencil/intern/gpencil_io_base.hh
index c8d85d08f7b..02758883f19 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_base.hh
+++ b/source/blender/io/gpencil/intern/gpencil_io_base.hh
@@ -37,9 +37,9 @@ struct Object;
 struct RegionView3D;
 struct Scene;
 
-struct bGPdata;
 struct bGPDlayer;
 struct bGPDstroke;
+struct bGPdata;
 
 using blender::Vector;
 
diff --git a/source/blender/io/gpencil/intern/gpencil_io_import_svg.hh b/source/blender/io/gpencil/intern/gpencil_io_import_svg.hh
index 0e9271dd2c6..99e8b1ed4fd 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_import_svg.hh
+++ b/source/blender/io/gpencil/intern/gpencil_io_import_svg.hh
@@ -24,10 +24,10 @@
 #include "gpencil_io_import_base.hh"
 
 struct GpencilIOParams;
-struct NSVGshape;
 struct NSVGpath;
-struct bGPdata;
+struct NSVGshape;
 struct bGPDframe;
+struct bGPdata;
 
 #define SVG_IMPORTER_NAME "SVG Import for Grease Pencil"
 #define SVG_IMPORTER_VERSION "v1.0"
diff --git a/source/blender/makesdna/DNA_curve_types.h b/source/blender/makesdna/DNA_curve_types.h
index 3732de6c0ec..520fc6c1b00 100644
--- a/source/blender/makesdna/DNA_curve_types.h
+++ b/source/blender/makesdna/DNA_curve_types.h
@@ -35,6 +35,7 @@ extern "C" {
 #define MAXTEXTBOX 256 /* used in readfile.c and editfont.c */
 
 struct AnimData;
+struct CurveEval;
 struct CurveProfile;
 struct EditFont;
 struct GHash;
@@ -43,7 +44,6 @@ struct Key;
 struct Material;
 struct Object;
 struct VFont;
-struct CurveEval;
 
 /* These two Lines with # tell makesdna this struct can be excluded. */
 #
diff --git a/source/blender/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h
index 0952c45e81f..380d8ad1249 100644
--- a/source/blender/makesdna/DNA_gpencil_types.h
+++ b/source/blender/makesdna/DNA_gpencil_types.h
@@ -33,8 +33,8 @@ extern "C" {
 
 struct AnimData;
 struct Curve;
-struct MDeformVert;
 struct Curve;
+struct MDeformVert;
 
 #define GP_DEFAULT_PIX_FACTOR 1.0f
 #define GP_DEFAULT_GRID_LINES 4
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h
index 5e4692481ba..94176d946b3 100644
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@ -37,6 +37,8 @@ struct Collection;
 struct ID;
 struct Image;
 struct ListBase;
+struct Material;
+struct Tex;
 struct bGPdata;
 struct bNodeInstanceHash;
 struct bNodeLink;
@@ -44,8 +46,6 @@ struct bNodePreview;
 struct bNodeTreeExec;
 struct bNodeType;
 struct uiBlock;
-struct Tex;
-struct Material;
 
 #define NODE_MAXSTR 64
 
diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h
index 1bd4c9233e3..55dc51e0632 100644
--- a/source/blender/makesdna/DNA_sequence_types.h
+++ b/source/blender/makesdna/DNA_sequence_types.h
@@ -43,9 +43,9 @@ extern "C" {
 struct Ipo;
 struct MovieClip;
 struct Scene;
+struct SequenceLookup;
 struct VFont;
 struct bSound;
-struct SequenceLookup;
 
 /* strlens; 256= FILE_MAXFILE, 768= FILE_MAXDIR */
 
diff --git a/source/blender/python/BPY_extern.h b/source/blender/python/BPY_extern.h
index 90f54c50a6d..84d804f8bdf 100644
--- a/source/blender/python/BPY_extern.h
+++ b/source/blender/python/BPY_extern.h
@@ -20,8 +20,8 @@
 
 #pragma once
 
-struct AnimationEvalContext;
 struct ARegionType;
+struct AnimationEvalContext;
 struct ChannelDriver; /* DNA_anim_types.h */
 struct ID;            /* DNA_ID.h */
 struct ListBase;      /* DNA_listBase.h */
diff --git a/source/blender/sequencer/SEQ_iterator.h b/source/blender/sequencer/SEQ_iterator.h
index aa2e182e1c0..e4c9f20f736 100644
--- a/source/blender/sequencer/SEQ_iterator.h
+++ b/source/blender/sequencer/SEQ_iterator.h
@@ -30,9 +30,9 @@ extern "C" {
 #include "BLI_ghash.h"
 
 struct Editing;
-struct Sequence;
 struct GSet;
 struct GSetIterator;
+struct Sequence;
 
 #define SEQ_ITERATOR_FOREACH(var, collection) \
   for (SeqIterator iter = {{{NULL}}}; \
diff --git a/source/blender/sequencer/SEQ_proxy.h b/source/blender/sequencer/SEQ_proxy.h
index b06adef2802..7bfe932ff1c 100644
--- a/source/blender/sequencer/SEQ_proxy.h
+++ b/source/blender/sequencer/SEQ_proxy.h
@@ -34,8 +34,8 @@ struct ListBase;
 struct Main;
 struct Scene;
 struct SeqIndexBuildContext;
-struct Sequence;
 struct SeqRenderData;
+struct Sequence;
 
 bool SEQ_proxy_rebuild_context(struct Main *bmain,
                                struct Depsgraph *depsgraph,
diff --git a/source/blender/sequencer/SEQ_sequencer.h b/source/blender/sequencer/SEQ_sequencer.h
index 706f4064bf3..f4338d13c8f 100644
--- a/source/blender/sequencer/SEQ_sequencer.h
+++ b/source/blender/sequencer/SEQ_sequencer.h
@@ -32,8 +32,8 @@ extern "C" {
 struct Editing;
 struct Scene;
 struct Sequence;
-struct SequencerToolSettings;
 struct SequenceLookup;
+struct SequencerToolSettings;
 
 /* RNA enums, just to be more readable */
 enum {
diff --git a/source/blender/sequencer/SEQ_transform.h b/source/blender/sequencer/SEQ_transform.h
index 837a2de5742..9ff827333be 100644
--- a/source/blender/sequencer/SEQ_transform.h
+++ b/source/blender/sequencer/SEQ_transform.h
@@ -29,8 +29,8 @@ extern "C" {
 
 struct ListBase;
 struct Scene;
-struct Sequence;
 struct SeqCollection;
+struct Sequence;
 
 int SEQ_transform_get_left_handle_frame(struct Sequence *seq);
 int SEQ_transform_get_right_handle_frame(struct Sequence *seq);