Cleanup: unused includes from source/blender/windowmanager

Remove 56 includes.
2024-02-13 11:58:42 +11:00
parent c29fdd1e12
commit 6cc6ccecd0
20 changed files with 6 additions and 80 deletions
--- a/source/blender/windowmanager/gizmo/intern/wm_gizmo.cc
+++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo.cc
@@ -30,15 +30,10 @@
 #include "ED_screen.hh"
 #include "ED_view3d.hh"

-#include "UI_interface.hh"
-
 #ifdef WITH_PYTHON
 #  include "BPY_extern.h"
 #endif

-/* only for own init/exit calls (wm_gizmotype_init/wm_gizmotype_free) */
-#include "wm.hh"
-
 /* own includes */
 #include "wm_gizmo_intern.hh"
 #include "wm_gizmo_wmapi.hh"
--- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_group_type.cc
+++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group_type.cc
@@ -11,20 +11,14 @@
 #include "BLI_ghash.h"
 #include "BLI_utildefines.h"

-#include "BKE_context.hh"
-
 #include "MEM_guardedalloc.h"

 #include "RNA_access.hh"
 #include "RNA_define.hh"
 #include "RNA_prototypes.h"

-#include "WM_api.hh"
 #include "WM_types.hh"

-/* only for own init/exit calls (wm_gizmogrouptype_init/wm_gizmogrouptype_free) */
-#include "wm.hh"
-
 /* own includes */
 #include "wm_gizmo_intern.hh"
 #include "wm_gizmo_wmapi.hh"
--- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_target_props.cc
+++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_target_props.cc
@@ -14,21 +14,14 @@

 #include "RNA_access.hh"

-#include "WM_api.hh"
 #include "WM_message.hh"
 #include "WM_types.hh"

-#include "wm.hh"
-
-#include "ED_keyframing.hh"
 #include "ED_screen.hh"
-#include "ED_view3d.hh"

 #include "ANIM_keyframing.hh"

 /* own includes */
-#include "wm_gizmo_intern.hh"
-#include "wm_gizmo_wmapi.hh"

 /* -------------------------------------------------------------------- */
 /** \name Property Definition
--- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_type.cc
+++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_type.cc
@@ -12,7 +12,6 @@
 #include "BLI_listbase.h"
 #include "BLI_utildefines.h"

-#include "BKE_context.hh"
 #include "BKE_main.hh"

 #include "DNA_screen_types.h"
@@ -24,14 +23,10 @@
 #include "RNA_define.hh"
 #include "RNA_prototypes.h"

-#include "WM_api.hh"
 #include "WM_types.hh"

 #include "ED_screen.hh"

-/* only for own init/exit calls (wm_gizmotype_init/wm_gizmotype_free) */
-#include "wm.hh"
-
 /* own includes */
 #include "wm_gizmo_intern.hh"
 #include "wm_gizmo_wmapi.hh"
--- a/source/blender/windowmanager/intern/wm_cursors.cc
+++ b/source/blender/windowmanager/intern/wm_cursors.cc
@@ -15,13 +15,10 @@

 #include "BLI_utildefines.h"

-#include "BLI_sys_types.h"
-
 #include "DNA_listBase.h"
 #include "DNA_userdef_types.h"
 #include "DNA_workspace_types.h"

-#include "BKE_context.hh"
 #include "BKE_global.hh"
 #include "BKE_main.hh"

--- a/source/blender/windowmanager/intern/wm_draw.cc
+++ b/source/blender/windowmanager/intern/wm_draw.cc
@@ -21,15 +21,12 @@

 #include "MEM_guardedalloc.h"

-#include "BLI_blenlib.h"
 #include "BLI_math_matrix.h"
 #include "BLI_math_vector_types.hh"
 #include "BLI_utildefines.h"

 #include "BKE_context.hh"
-#include "BKE_global.hh"
 #include "BKE_image.h"
-#include "BKE_main.hh"
 #include "BKE_scene.hh"
 #include "BKE_screen.hh"

--- a/source/blender/windowmanager/intern/wm_event_query.cc
+++ b/source/blender/windowmanager/intern/wm_event_query.cc
@@ -12,7 +12,6 @@
 #include <cstring>

 #include "DNA_listBase.h"
-#include "DNA_scene_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_userdef_types.h"
 #include "DNA_windowmanager_types.h"
@@ -22,8 +21,6 @@
 #include "BLI_math_vector.h"
 #include "BLI_utildefines.h"

-#include "BKE_context.hh"
-
 #include "RNA_access.hh"

 #include "WM_api.hh"
@@ -34,8 +31,6 @@

 #include "RNA_enum_types.hh"

-#include "DEG_depsgraph.hh"
-
 /* -------------------------------------------------------------------- */
 /** \name Event Printing
 * \{ */
--- a/source/blender/windowmanager/intern/wm_gesture.cc
+++ b/source/blender/windowmanager/intern/wm_gesture.cc
@@ -20,13 +20,10 @@
 #include "BLI_lasso_2d.h"
 #include "BLI_utildefines.h"

-#include "BKE_context.hh"
-
 #include "WM_api.hh"
 #include "WM_types.hh"

 #include "wm.hh"
-#include "wm_draw.hh"

 #include "GPU_immediate.h"
 #include "GPU_immediate_util.h"
--- a/source/blender/windowmanager/intern/wm_gesture_ops.cc
+++ b/source/blender/windowmanager/intern/wm_gesture_ops.cc
@@ -26,16 +26,12 @@
 #include "WM_types.hh"

 #include "wm.hh"
-#include "wm_event_system.hh"
 #include "wm_event_types.hh"

 #include "ED_screen.hh"
 #include "ED_select_utils.hh"

-#include "UI_interface.hh"
-
 #include "RNA_access.hh"
-#include "RNA_define.hh"

 /* -------------------------------------------------------------------- */
 /** \name Internal Gesture Utilities
--- a/source/blender/windowmanager/intern/wm_init_exit.cc
+++ b/source/blender/windowmanager/intern/wm_init_exit.cc
@@ -35,7 +35,6 @@

 #include "BKE_blender.hh"
 #include "BKE_blendfile.hh"
-#include "BKE_callbacks.hh"
 #include "BKE_context.hh"
 #include "BKE_global.hh"
 #include "BKE_icons.h"
@@ -44,9 +43,7 @@
 #include "BKE_lib_remap.hh"
 #include "BKE_main.hh"
 #include "BKE_mball_tessellate.hh"
-#include "BKE_node.hh"
 #include "BKE_preview_image.hh"
-#include "BKE_report.hh"
 #include "BKE_scene.hh"
 #include "BKE_screen.hh"
 #include "BKE_sound.h"
@@ -63,10 +60,7 @@
 #include "RE_engine.h"
 #include "RE_pipeline.h" /* RE_ free stuff */

-#include "IMB_thumbs.hh"
-
 #ifdef WITH_PYTHON
-#  include "BPY_extern.h"
 #  include "BPY_extern_python.h"
 #  include "BPY_extern_run.h"
 #endif
@@ -89,7 +83,6 @@
 #include "wm_window.hh"

 #include "ED_anim_api.hh"
-#include "ED_armature.hh"
 #include "ED_asset.hh"
 #include "ED_gpencil_legacy.hh"
 #include "ED_keyframes_edit.hh"
@@ -100,7 +93,6 @@
 #include "ED_space_api.hh"
 #include "ED_undo.hh"
 #include "ED_util.hh"
-#include "ED_view3d.hh"

 #include "BLF_api.hh"
 #include "BLT_lang.hh"
--- a/source/blender/windowmanager/intern/wm_jobs.cc
+++ b/source/blender/windowmanager/intern/wm_jobs.cc
@@ -19,7 +19,6 @@
 #include "BLI_time.h"
 #include "BLI_utildefines.h"

-#include "BKE_context.hh"
 #include "BKE_global.hh"
 #include "BKE_report.hh"

--- a/source/blender/windowmanager/intern/wm_menu_type.cc
+++ b/source/blender/windowmanager/intern/wm_menu_type.cc
@@ -13,7 +13,6 @@
 #include "BLI_sys_types.h"

 #include "DNA_windowmanager_types.h"
-#include "DNA_workspace_types.h"

 #include "MEM_guardedalloc.h"

--- a/source/blender/windowmanager/intern/wm_platform_support.cc
+++ b/source/blender/windowmanager/intern/wm_platform_support.cc
@@ -15,7 +15,6 @@
 #include "BLI_linklist.h"
 #include "BLI_path_util.h"
 #include "BLI_string.h"
-#include "BLI_sys_types.h"

 #include "BLT_translation.hh"

@@ -24,8 +23,6 @@

 #include "GPU_platform.h"

-#include "GHOST_C-api.h"
-
 #define WM_PLATFORM_SUPPORT_TEXT_SIZE 1024

 /**
--- a/source/blender/windowmanager/intern/wm_splash_screen.cc
+++ b/source/blender/windowmanager/intern/wm_splash_screen.cc
@@ -17,8 +17,6 @@
 #include <algorithm>
 #include <cstring>

-#include "CLG_log.h"
-
 #include "DNA_ID.h"
 #include "DNA_scene_types.h"
 #include "DNA_screen_types.h"
@@ -31,12 +29,9 @@
 #include "BKE_appdir.hh"
 #include "BKE_blender_version.h"
 #include "BKE_context.hh"
-#include "BKE_screen.hh"

 #include "BLT_translation.hh"

-#include "BLF_api.hh"
-
 #include "IMB_imbuf.hh"
 #include "IMB_imbuf_types.hh"

--- a/source/blender/windowmanager/intern/wm_stereo.cc
+++ b/source/blender/windowmanager/intern/wm_stereo.cc
@@ -34,7 +34,6 @@
 #include "WM_api.hh"
 #include "WM_types.hh"
 #include "wm.hh"
-#include "wm_draw.hh"
 #include "wm_window.hh"

 #include "UI_interface.hh"
--- a/source/blender/windowmanager/intern/wm_surface.cc
+++ b/source/blender/windowmanager/intern/wm_surface.cc
@@ -6,25 +6,20 @@
 * \ingroup wm
 */

-#include "BKE_context.hh"
-
-#include "BLF_api.hh"
-
 #include "BLI_listbase.h"
-#include "BLI_threads.h"
+#ifndef NDEBUG
+#  include "BLI_threads.h"
+#endif

 #include "GHOST_C-api.h"

-#include "GPU_batch_presets.h"
 #include "GPU_context.h"
 #include "GPU_framebuffer.h"
-#include "GPU_immediate.h"

 #include "MEM_guardedalloc.h"

 #include "WM_api.hh"
 #include "WM_types.hh"
-#include "wm.hh"

 #include "wm_surface.hh"

--- a/source/blender/windowmanager/intern/wm_tooltip.cc
+++ b/source/blender/windowmanager/intern/wm_tooltip.cc
@@ -16,8 +16,6 @@

 #include "BKE_context.hh"

-#include "ED_screen.hh"
-
 #include "UI_interface.hh"

 #include "WM_api.hh"
--- a/source/blender/windowmanager/xr/intern/wm_xr.cc
+++ b/source/blender/windowmanager/xr/intern/wm_xr.cc
@@ -15,8 +15,6 @@
 #include "BKE_main.hh"
 #include "BKE_report.hh"

-#include "DEG_depsgraph.hh"
-
 #include "DNA_scene_types.h"
 #include "DNA_windowmanager_types.h"

@@ -24,13 +22,14 @@

 #include "GHOST_C-api.h"

-#include "GPU_platform.h"
+#ifdef WIN32
+#  include "GPU_platform.h"
+#endif

 #include "MEM_guardedalloc.h"

 #include "WM_api.hh"

-#include "wm_surface.hh"
 #include "wm_xr_intern.hh"

 struct wmXrErrorHandlerData {
--- a/source/blender/windowmanager/xr/intern/wm_xr_actionmap.cc
+++ b/source/blender/windowmanager/xr/intern/wm_xr_actionmap.cc
@@ -13,14 +13,11 @@
 #include <cmath>
 #include <cstring>

-#include "BKE_context.hh"
 #include "BKE_idprop.h"

 #include "BLI_listbase.h"
 #include "BLI_string.h"

-#include "GHOST_Types.h"
-
 #include "MEM_guardedalloc.h"

 #include "WM_api.hh"
--- a/source/blender/windowmanager/xr/intern/wm_xr_draw.cc
+++ b/source/blender/windowmanager/xr/intern/wm_xr_draw.cc
@@ -12,8 +12,6 @@

 #include <cstring>

-#include "BKE_context.hh"
-
 #include "BLI_listbase.h"
 #include "BLI_math_matrix.h"
 #include "BLI_math_rotation.h"
@@ -30,7 +28,6 @@

 #include "WM_api.hh"

-#include "wm_surface.hh"
 #include "wm_xr_intern.hh"

 void wm_xr_pose_to_mat(const GHOST_XrPose *pose, float r_mat[4][4])