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 | |
parent | 28b10224346a9a2e55267f98357991a841eeda5b (diff) |
Cleanup: use C++ style casts in various places
Diffstat (limited to 'source/blender/nodes')
8 files changed, 33 insertions, 20 deletions
diff --git a/source/blender/nodes/NOD_derived_node_tree.hh b/source/blender/nodes/NOD_derived_node_tree.hh index 570b6cb704d..9c71ae79cf2 100644 --- a/source/blender/nodes/NOD_derived_node_tree.hh +++ b/source/blender/nodes/NOD_derived_node_tree.hh @@ -265,12 +265,12 @@ inline const DSocket &DSocket::as_base() const inline const DInputSocket &DSocket::as_input() const { - return *(DInputSocket *)this; + return static_cast<const DInputSocket &>(*this); } inline const DOutputSocket &DSocket::as_output() const { - return *(DOutputSocket *)this; + return static_cast<const DOutputSocket &>(*this); } inline PointerRNA *DSocket::rna() const diff --git a/source/blender/nodes/NOD_node_tree_multi_function.hh b/source/blender/nodes/NOD_node_tree_multi_function.hh index cbd7a47f090..25787231afa 100644 --- a/source/blender/nodes/NOD_node_tree_multi_function.hh +++ b/source/blender/nodes/NOD_node_tree_multi_function.hh @@ -126,8 +126,20 @@ class MFNetworkTreeMap { void add_try_match(const DNode &dnode, fn::MFNode &node) { - this->add_try_match(dnode.inputs(), node.inputs()); - this->add_try_match(dnode.outputs(), node.outputs()); + this->add_try_match(dnode.inputs().cast<const DSocket *>(), + node.inputs().cast<fn::MFSocket *>()); + this->add_try_match(dnode.outputs().cast<const DSocket *>(), + node.outputs().cast<fn::MFSocket *>()); + } + + void add_try_match(Span<const DInputSocket *> dsockets, Span<fn::MFInputSocket *> sockets) + { + this->add_try_match(dsockets.cast<const DSocket *>(), sockets.cast<fn::MFSocket *>()); + } + + void add_try_match(Span<const DOutputSocket *> dsockets, Span<fn::MFOutputSocket *> sockets) + { + this->add_try_match(dsockets.cast<const DSocket *>(), sockets.cast<fn::MFSocket *>()); } void add_try_match(Span<const DSocket *> dsockets, Span<fn::MFSocket *> sockets) @@ -277,7 +289,7 @@ class SocketMFNetworkBuilder : public MFNetworkBuilderBase { */ template<typename T> T *socket_default_value() { - return (T *)bsocket_->default_value; + return static_cast<T *>(bsocket_->default_value); } /** diff --git a/source/blender/nodes/NOD_node_tree_ref.hh b/source/blender/nodes/NOD_node_tree_ref.hh index 6d1c239d2cb..3b085248a39 100644 --- a/source/blender/nodes/NOD_node_tree_ref.hh +++ b/source/blender/nodes/NOD_node_tree_ref.hh @@ -248,13 +248,13 @@ inline const SocketRef &SocketRef::as_base() const inline const InputSocketRef &SocketRef::as_input() const { BLI_assert(this->is_input()); - return *(const InputSocketRef *)this; + return static_cast<const InputSocketRef &>(*this); } inline const OutputSocketRef &SocketRef::as_output() const { BLI_assert(this->is_output()); - return *(const OutputSocketRef *)this; + return static_cast<const OutputSocketRef &>(*this); } inline PointerRNA *SocketRef::rna() const diff --git a/source/blender/nodes/function/nodes/node_fn_random_float.cc b/source/blender/nodes/function/nodes/node_fn_random_float.cc index 2ee0830637a..584c544946e 100644 --- a/source/blender/nodes/function/nodes/node_fn_random_float.cc +++ b/source/blender/nodes/function/nodes/node_fn_random_float.cc @@ -57,7 +57,7 @@ class RandomFloatFunction : public blender::fn::MultiFunction { const float min_value = min_values[i]; const float max_value = max_values[i]; const int seed = seeds[i]; - const float value = BLI_hash_int_01((uint32_t)seed ^ function_seed_); + const float value = BLI_hash_int_01(static_cast<uint32_t>(seed) ^ function_seed_); values[i] = value * (max_value - min_value) + min_value; } } 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); diff --git a/source/blender/nodes/simulation/node_simulation_tree.cc b/source/blender/nodes/simulation/node_simulation_tree.cc index 3f0e70259d6..eb3257d7e66 100644 --- a/source/blender/nodes/simulation/node_simulation_tree.cc +++ b/source/blender/nodes/simulation/node_simulation_tree.cc @@ -32,8 +32,8 @@ bNodeTreeType *ntreeType_Simulation; void register_node_tree_type_sim(void) { - bNodeTreeType *tt = ntreeType_Simulation = (bNodeTreeType *)MEM_callocN( - sizeof(bNodeTreeType), "simulation node tree type"); + bNodeTreeType *tt = ntreeType_Simulation = static_cast<bNodeTreeType *>( + MEM_callocN(sizeof(bNodeTreeType), "simulation node tree type")); tt->type = NTREE_SIMULATION; strcpy(tt->idname, "SimulationNodeTree"); strcpy(tt->ui_name, N_("Simulation Editor")); |