[Bf-blender-cvs] [a243a9dc79e] master: Cleanup: Remove unused headers in asset files

Julian Eisel noreply at git.blender.org
Wed Dec 14 15:43:14 CET 2022


Commit: a243a9dc79ebe6cf4ee473be69a0d28b5b05375c
Author: Julian Eisel
Date:   Tue Dec 13 17:24:24 2022 +0100
Branches: master
https://developer.blender.org/rBa243a9dc79ebe6cf4ee473be69a0d28b5b05375c

Cleanup: Remove unused headers in asset files

===================================================================

M	source/blender/asset_system/intern/asset_catalog.cc
M	source/blender/asset_system/intern/asset_library.cc
M	source/blender/asset_system/intern/asset_library_service.cc
M	source/blender/asset_system/intern/asset_representation.cc
M	source/blender/asset_system/tests/asset_catalog_test.cc
M	source/blender/asset_system/tests/asset_catalog_tree_test.cc
M	source/blender/asset_system/tests/asset_library_test.cc
M	source/blender/editors/asset/intern/asset_handle.cc
M	source/blender/editors/asset/intern/asset_indexer.cc
M	source/blender/editors/asset/intern/asset_list.cc
M	source/blender/editors/asset/intern/asset_ops.cc

===================================================================

diff --git a/source/blender/asset_system/intern/asset_catalog.cc b/source/blender/asset_system/intern/asset_catalog.cc
index 9b47aca1209..c295f2de16e 100644
--- a/source/blender/asset_system/intern/asset_catalog.cc
+++ b/source/blender/asset_system/intern/asset_catalog.cc
@@ -9,7 +9,6 @@
 
 #include "AS_asset_catalog.hh"
 #include "AS_asset_catalog_tree.hh"
-#include "AS_asset_library.h"
 #include "AS_asset_library.hh"
 
 #include "BLI_fileops.hh"
diff --git a/source/blender/asset_system/intern/asset_library.cc b/source/blender/asset_system/intern/asset_library.cc
index 73f81a50e46..9a6b73ef501 100644
--- a/source/blender/asset_system/intern/asset_library.cc
+++ b/source/blender/asset_system/intern/asset_library.cc
@@ -17,7 +17,6 @@
 
 #include "BLI_fileops.h"
 #include "BLI_path_util.h"
-#include "BLI_set.hh"
 
 #include "DNA_userdef_types.h"
 
diff --git a/source/blender/asset_system/intern/asset_library_service.cc b/source/blender/asset_system/intern/asset_library_service.cc
index 37136968946..79097ac8cd2 100644
--- a/source/blender/asset_system/intern/asset_library_service.cc
+++ b/source/blender/asset_system/intern/asset_library_service.cc
@@ -7,8 +7,6 @@
 #include "BKE_blender.h"
 #include "BKE_preferences.h"
 
-#include "BLI_fileops.h" /* For PATH_MAX (at least on Windows). */
-#include "BLI_path_util.h"
 #include "BLI_string_ref.hh"
 
 #include "DNA_asset_types.h"
diff --git a/source/blender/asset_system/intern/asset_representation.cc b/source/blender/asset_system/intern/asset_representation.cc
index c6bc5193570..573358b7df7 100644
--- a/source/blender/asset_system/intern/asset_representation.cc
+++ b/source/blender/asset_system/intern/asset_representation.cc
@@ -13,8 +13,6 @@
 #include "AS_asset_representation.h"
 #include "AS_asset_representation.hh"
 
-#include "BKE_asset.h"
-
 namespace blender::asset_system {
 
 AssetRepresentation::AssetRepresentation(AssetIdentifier &&identifier,
diff --git a/source/blender/asset_system/tests/asset_catalog_test.cc b/source/blender/asset_system/tests/asset_catalog_test.cc
index 87819f3683b..3e117e3da97 100644
--- a/source/blender/asset_system/tests/asset_catalog_test.cc
+++ b/source/blender/asset_system/tests/asset_catalog_test.cc
@@ -4,7 +4,6 @@
 #include "AS_asset_catalog.hh"
 #include "AS_asset_catalog_tree.hh"
 
-#include "BKE_appdir.h"
 #include "BKE_preferences.h"
 
 #include "BLI_fileops.h"
@@ -13,8 +12,6 @@
 #include "DNA_asset_types.h"
 #include "DNA_userdef_types.h"
 
-#include "CLG_log.h"
-
 #include "testing/testing.h"
 
 #include "asset_library_test_common.hh"
diff --git a/source/blender/asset_system/tests/asset_catalog_tree_test.cc b/source/blender/asset_system/tests/asset_catalog_tree_test.cc
index fb1cbde517d..3355423cb48 100644
--- a/source/blender/asset_system/tests/asset_catalog_tree_test.cc
+++ b/source/blender/asset_system/tests/asset_catalog_tree_test.cc
@@ -4,17 +4,8 @@
 #include "AS_asset_catalog.hh"
 #include "AS_asset_catalog_tree.hh"
 
-#include "BKE_appdir.h"
-#include "BKE_preferences.h"
-
-#include "BLI_fileops.h"
 #include "BLI_path_util.h"
 
-#include "DNA_asset_types.h"
-#include "DNA_userdef_types.h"
-
-#include "CLG_log.h"
-
 #include "testing/testing.h"
 
 #include "asset_library_test_common.hh"
diff --git a/source/blender/asset_system/tests/asset_library_test.cc b/source/blender/asset_system/tests/asset_library_test.cc
index 059f3d9a46c..1b8d2f8ff0c 100644
--- a/source/blender/asset_system/tests/asset_library_test.cc
+++ b/source/blender/asset_system/tests/asset_library_test.cc
@@ -5,7 +5,6 @@
 #include "AS_asset_library.h"
 #include "AS_asset_library.hh"
 
-#include "BKE_appdir.h"
 #include "BKE_callbacks.h"
 
 #include "asset_library_service.hh"
diff --git a/source/blender/editors/asset/intern/asset_handle.cc b/source/blender/editors/asset/intern/asset_handle.cc
index 3528a3824db..26b6f09b231 100644
--- a/source/blender/editors/asset/intern/asset_handle.cc
+++ b/source/blender/editors/asset/intern/asset_handle.cc
@@ -6,7 +6,6 @@
 
 #include <string>
 
-#include "AS_asset_identifier.hh"
 #include "AS_asset_representation.h"
 #include "AS_asset_representation.hh"
 
@@ -15,7 +14,6 @@
 #include "BLO_readfile.h"
 
 #include "ED_asset_handle.h"
-#include "ED_asset_list.hh"
 
 #include "WM_api.h"
 
diff --git a/source/blender/editors/asset/intern/asset_indexer.cc b/source/blender/editors/asset/intern/asset_indexer.cc
index 23d6a9d1edc..247db565f36 100644
--- a/source/blender/editors/asset/intern/asset_indexer.cc
+++ b/source/blender/editors/asset/intern/asset_indexer.cc
@@ -26,7 +26,6 @@
 #include "BKE_appdir.h"
 #include "BKE_asset.h"
 #include "BKE_idprop.hh"
-#include "BKE_preferences.h"
 
 #include "CLG_log.h"
 
diff --git a/source/blender/editors/asset/intern/asset_list.cc b/source/blender/editors/asset/intern/asset_list.cc
index 4a1f26abad0..5b3d256c70c 100644
--- a/source/blender/editors/asset/intern/asset_list.cc
+++ b/source/blender/editors/asset/intern/asset_list.cc
@@ -15,7 +15,6 @@
 #include "BKE_context.h"
 
 #include "BLI_map.hh"
-#include "BLI_path_util.h"
 #include "BLI_utility_mixins.hh"
 
 #include "DNA_space_types.h"
diff --git a/source/blender/editors/asset/intern/asset_ops.cc b/source/blender/editors/asset/intern/asset_ops.cc
index da4e0794fe8..497b655c7ce 100644
--- a/source/blender/editors/asset/intern/asset_ops.cc
+++ b/source/blender/editors/asset/intern/asset_ops.cc
@@ -9,13 +9,11 @@
 
 #include "BKE_bpath.h"
 #include "BKE_context.h"
-#include "BKE_global.h"
 #include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_preferences.h"
 #include "BKE_report.h"
 
-#include "BLI_fileops.h"
 #include "BLI_fnmatch.h"
 #include "BLI_path_util.h"
 #include "BLI_set.hh"
@@ -37,8 +35,6 @@
 
 #include "DNA_space_types.h"
 
-#include "BLO_writefile.h"
-
 using namespace blender;
 
 /* -------------------------------------------------------------------- */



More information about the Bf-blender-cvs mailing list