[Bf-blender-cvs] [60ad5f49fae] master: Cleanup: move C++ declarations to separate .hh header
Jacques Lucke
noreply at git.blender.org
Fri Nov 25 12:18:20 CET 2022
Commit: 60ad5f49fae67d3cc68cc7feede434a9d0a1e666
Author: Jacques Lucke
Date: Fri Nov 25 12:18:10 2022 +0100
Branches: master
https://developer.blender.org/rB60ad5f49fae67d3cc68cc7feede434a9d0a1e666
Cleanup: move C++ declarations to separate .hh header
===================================================================
M source/blender/editors/include/ED_node.h
A source/blender/editors/include/ED_node.hh
M source/blender/editors/space_node/node_relationships.cc
M source/blender/editors/transform/transform_convert_node.cc
===================================================================
diff --git a/source/blender/editors/include/ED_node.h b/source/blender/editors/include/ED_node.h
index 805c5b0b155..3ce972943b5 100644
--- a/source/blender/editors/include/ED_node.h
+++ b/source/blender/editors/include/ED_node.h
@@ -176,20 +176,3 @@ bool ED_space_node_color_sample(struct Main *bmain,
#ifdef __cplusplus
}
#endif
-
-#ifdef __cplusplus
-
-/* node_relationships.cc */
-
-namespace blender::ed::space_node {
-
-void node_insert_on_link_flags_set(SpaceNode &snode, const ARegion ®ion);
-/**
- * Assumes link with #NODE_LINKFLAG_HILITE set.
- */
-void node_insert_on_link_flags(Main &bmain, SpaceNode &snode);
-void node_insert_on_link_flags_clear(bNodeTree &node_tree);
-
-} // namespace blender::ed::space_node
-
-#endif
diff --git a/source/blender/editors/include/ED_node.hh b/source/blender/editors/include/ED_node.hh
new file mode 100644
index 00000000000..3929f5952e4
--- /dev/null
+++ b/source/blender/editors/include/ED_node.hh
@@ -0,0 +1,22 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#pragma once
+
+#include "ED_node.h"
+
+struct SpaceNode;
+struct ARegion;
+struct Main;
+struct bNodeTree;
+
+namespace blender::ed::space_node {
+
+void node_insert_on_link_flags_set(SpaceNode &snode, const ARegion ®ion);
+
+/**
+ * Assumes link with #NODE_LINKFLAG_HILITE set.
+ */
+void node_insert_on_link_flags(Main &bmain, SpaceNode &snode);
+void node_insert_on_link_flags_clear(bNodeTree &node_tree);
+
+} // namespace blender::ed::space_node
diff --git a/source/blender/editors/space_node/node_relationships.cc b/source/blender/editors/space_node/node_relationships.cc
index d1b8bd90122..a18b5c83857 100644
--- a/source/blender/editors/space_node/node_relationships.cc
+++ b/source/blender/editors/space_node/node_relationships.cc
@@ -23,7 +23,7 @@
#include "BKE_node_tree_update.h"
#include "BKE_screen.h"
-#include "ED_node.h" /* own include */
+#include "ED_node.hh" /* own include */
#include "ED_render.h"
#include "ED_screen.h"
#include "ED_space_api.h"
diff --git a/source/blender/editors/transform/transform_convert_node.cc b/source/blender/editors/transform/transform_convert_node.cc
index 9b4e257a8c7..446593a6cf8 100644
--- a/source/blender/editors/transform/transform_convert_node.cc
+++ b/source/blender/editors/transform/transform_convert_node.cc
@@ -18,7 +18,7 @@
#include "BKE_node_tree_update.h"
#include "BKE_report.h"
-#include "ED_node.h"
+#include "ED_node.hh"
#include "UI_interface.h"
#include "UI_view2d.h"
More information about the Bf-blender-cvs
mailing list