@@ -471,7 +471,7 @@ TreeNode::Ptr XMLParser::Pimpl::createNodeFromXML(const XMLElement *element,
471471 instance_name = element->Attribute (" ID" );
472472 }
473473
474- PortsRemapping remapping_parameters ;
474+ PortsRemapping parameters_map ;
475475
476476 if (element_name != " SubTree" ) // in Subtree attributes have different meaning...
477477 {
@@ -480,7 +480,7 @@ TreeNode::Ptr XMLParser::Pimpl::createNodeFromXML(const XMLElement *element,
480480 const std::string attribute_name = att->Name ();
481481 if (attribute_name != " ID" && attribute_name != " name" )
482482 {
483- remapping_parameters [attribute_name] = att->Value ();
483+ parameters_map [attribute_name] = att->Value ();
484484 }
485485 }
486486 }
@@ -495,12 +495,12 @@ TreeNode::Ptr XMLParser::Pimpl::createNodeFromXML(const XMLElement *element,
495495 const auto & manifest = factory.manifests ().at (ID);
496496
497497 // Check that name in remapping can be found in the manifest
498- for (const auto & remapping_it: remapping_parameters )
498+ for (const auto & param_it: parameters_map )
499499 {
500- if ( manifest.ports .count ( remapping_it .first ) == 0 )
500+ if ( manifest.ports .count ( param_it .first ) == 0 )
501501 {
502502 throw RuntimeError (" Possible typo? In the XML, you tried to remap port \" " ,
503- remapping_it .first , " \" in node [" , ID," / " , instance_name,
503+ param_it .first , " \" in node [" , ID," / " , instance_name,
504504 " ], but the manifest of this node does not contain a port with this name." );
505505 }
506506 }
@@ -511,16 +511,16 @@ TreeNode::Ptr XMLParser::Pimpl::createNodeFromXML(const XMLElement *element,
511511 const std::string& port_name = port_it.first ;
512512 const auto & port_info = port_it.second ;
513513
514- auto remap_it = remapping_parameters .find (port_name);
515- if ( remap_it == remapping_parameters .end ())
514+ auto remap_it = parameters_map .find (port_name);
515+ if ( remap_it == parameters_map .end ())
516516 {
517517 continue ;
518518 }
519- StringView remapping_value = remap_it->second ;
520- auto remapped_res = TreeNode::getRemappedKey (port_name, remapping_value );
521- if ( remapped_res )
519+ StringView param_value = remap_it->second ;
520+ auto param_res = TreeNode::getRemappedKey (port_name, param_value );
521+ if ( param_res )
522522 {
523- const auto & port_key = nonstd::to_string (remapped_res .value ());
523+ const auto & port_key = nonstd::to_string (param_res .value ());
524524
525525 auto prev_info = blackboard->portInfo ( port_key );
526526 if ( !prev_info )
@@ -545,20 +545,20 @@ TreeNode::Ptr XMLParser::Pimpl::createNodeFromXML(const XMLElement *element,
545545 }
546546
547547 // use manifest to initialize NodeConfiguration
548- for (const auto & remap_it: remapping_parameters )
548+ for (const auto & param_it: parameters_map )
549549 {
550- const auto & port_name = remap_it .first ;
550+ const auto & port_name = param_it .first ;
551551 auto port_it = manifest.ports .find ( port_name );
552552 if ( port_it != manifest.ports .end () )
553553 {
554554 auto direction = port_it->second .direction ();
555555 if ( direction != PortDirection::OUTPUT )
556556 {
557- config.input_ports .insert ( remap_it );
557+ config.input_ports .insert ( param_it );
558558 }
559559 if ( direction != PortDirection::INPUT )
560560 {
561- config.output_ports .insert ( remap_it );
561+ config.output_ports .insert ( param_it );
562562 }
563563 }
564564 }
0 commit comments