diff options
author | Jacques Lucke <jacques@blender.org> | 2020-08-07 19:24:59 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2020-08-07 19:42:21 +0300 |
commit | c50e5fcc344d00b03eb4a3141b5b45944c3570fd (patch) | |
tree | f683ae1a1f38551d160a5be2ee86561d51faca26 /source/blender/nodes/intern | |
parent | 28b10224346a9a2e55267f98357991a841eeda5b (diff) |
Cleanup: use C++ style casts in various places
Diffstat (limited to 'source/blender/nodes/intern')
-rw-r--r-- | source/blender/nodes/intern/derived_node_tree.cc | 9 | ||||
-rw-r--r-- | source/blender/nodes/intern/node_tree_dependencies.cc | 4 | ||||
-rw-r--r-- | source/blender/nodes/intern/node_tree_ref.cc | 8 |
3 files changed, 11 insertions, 10 deletions
diff --git a/source/blender/nodes/intern/derived_node_tree.cc b/source/blender/nodes/intern/derived_node_tree.cc index bcef8c33a3b..4612a479ebc 100644 --- a/source/blender/nodes/intern/derived_node_tree.cc +++ b/source/blender/nodes/intern/derived_node_tree.cc @@ -59,9 +59,10 @@ BLI_NOINLINE void DerivedNodeTree::insert_nodes_and_links_in_id_order(const Node /* Insert links. */ for (const NodeRef *node_ref : tree_ref.nodes()) { for (const InputSocketRef *to_socket_ref : node_ref->inputs()) { - DInputSocket *to_socket = (DInputSocket *)sockets_map[to_socket_ref->id()]; + DInputSocket *to_socket = static_cast<DInputSocket *>(sockets_map[to_socket_ref->id()]); for (const OutputSocketRef *from_socket_ref : to_socket_ref->linked_sockets()) { - DOutputSocket *from_socket = (DOutputSocket *)sockets_map[from_socket_ref->id()]; + DOutputSocket *from_socket = static_cast<DOutputSocket *>( + sockets_map[from_socket_ref->id()]); to_socket->linked_sockets_.append(from_socket); from_socket->linked_sockets_.append(to_socket); } @@ -130,7 +131,7 @@ BLI_NOINLINE void DerivedNodeTree::expand_group_node(DNode &group_node, const NodeRef &group_node_ref = *group_node.node_ref_; BLI_assert(group_node_ref.is_group_node()); - bNodeTree *btree = (bNodeTree *)group_node_ref.bnode()->id; + bNodeTree *btree = reinterpret_cast<bNodeTree *>(group_node_ref.bnode()->id); if (btree == nullptr) { return; } @@ -366,7 +367,7 @@ static dot::Cluster *get_cluster_for_parent(dot::DirectedGraph &graph, } return clusters.lookup_or_add_cb(parent, [&]() { dot::Cluster *parent_cluster = get_cluster_for_parent(graph, clusters, parent->parent()); - bNodeTree *btree = (bNodeTree *)parent->node_ref().bnode()->id; + bNodeTree *btree = reinterpret_cast<bNodeTree *>(parent->node_ref().bnode()->id); dot::Cluster *new_cluster = &graph.new_cluster(parent->node_ref().name() + " / " + StringRef(btree->id.name + 2)); new_cluster->set_parent_cluster(parent_cluster); diff --git a/source/blender/nodes/intern/node_tree_dependencies.cc b/source/blender/nodes/intern/node_tree_dependencies.cc index efe75a10f7e..9d279dd4d75 100644 --- a/source/blender/nodes/intern/node_tree_dependencies.cc +++ b/source/blender/nodes/intern/node_tree_dependencies.cc @@ -28,7 +28,7 @@ static void add_dependencies_of_node_tree(bNodeTree &ntree, NodeTreeDependencies LISTBASE_FOREACH (bNode *, node, &ntree.nodes) { LISTBASE_FOREACH (bNodeSocket *, socket, &node->inputs) { if (socket->type == SOCK_OBJECT) { - Object *object = ((bNodeSocketValueObject *)socket->default_value)->value; + Object *object = reinterpret_cast<bNodeSocketValueObject *>(socket->default_value)->value; if (object != nullptr) { r_dependencies.add_transform_dependency(object); if (object->type == OB_MESH) { @@ -39,7 +39,7 @@ static void add_dependencies_of_node_tree(bNodeTree &ntree, NodeTreeDependencies } if (node->type == NODE_GROUP) { - bNodeTree *group = (bNodeTree *)node->id; + bNodeTree *group = reinterpret_cast<bNodeTree *>(node->id); if (group != nullptr) { add_dependencies_of_node_tree(*group, r_dependencies); } diff --git a/source/blender/nodes/intern/node_tree_ref.cc b/source/blender/nodes/intern/node_tree_ref.cc index 47669bc5ca2..96ad1e0280e 100644 --- a/source/blender/nodes/intern/node_tree_ref.cc +++ b/source/blender/nodes/intern/node_tree_ref.cc @@ -101,9 +101,9 @@ InputSocketRef &NodeTreeRef::find_input_socket(Map<bNode *, NodeRef *> &node_map bNodeSocket *bsocket) { NodeRef *node = node_mapping.lookup(bnode); - for (SocketRef *socket : node->inputs_) { + for (InputSocketRef *socket : node->inputs_) { if (socket->bsocket_ == bsocket) { - return *(InputSocketRef *)socket; + return *socket; } } BLI_assert(false); @@ -115,9 +115,9 @@ OutputSocketRef &NodeTreeRef::find_output_socket(Map<bNode *, NodeRef *> &node_m bNodeSocket *bsocket) { NodeRef *node = node_mapping.lookup(bnode); - for (SocketRef *socket : node->outputs_) { + for (OutputSocketRef *socket : node->outputs_) { if (socket->bsocket_ == bsocket) { - return *(OutputSocketRef *)socket; + return *socket; } } BLI_assert(false); |