Skip to content
Snippets Groups Projects
Commit 3e592440 authored by Raphael Grimm's avatar Raphael Grimm
Browse files

Adapt to upstream changes (icePropertiesUpdated -> componentPropertiesUpdated)

parent 3cbd5fda
No related branches found
No related tags found
No related merge requests found
......@@ -181,9 +181,9 @@ namespace armarx
}
// //////////////////////////////////////////////////////////////////////////// //
// other ManagedIceObject / Component methods
void ModuleBase::icePropertiesUpdated(const std::set<std::string>& changedProperties)
void ModuleBase::componentPropertiesUpdated(const std::set<std::string>& changedProperties)
{
#define call_module_hook(Type) cast_to_and_call(::armarx::RobotUnitModule::Type, _icePropertiesUpdated(changedProperties), true)
#define call_module_hook(Type) cast_to_and_call(::armarx::RobotUnitModule::Type, _componentPropertiesUpdated(changedProperties), true)
for_each_module(call_module_hook)
#undef call_module_hook
}
......
......@@ -349,8 +349,8 @@ namespace armarx
// ////////////////////// other ManagedIceObject / Component methods ////////////////////// //
// //////////////////////////////////////////////////////////////////////////////////////// //
protected:
/// @see \ref ManagedIceObject::icePropertiesUpdated
void icePropertiesUpdated(const std::set<std::string>& changedProperties) override;
/// @see \ref ManagedIceObject::componentPropertiesUpdated
void componentPropertiesUpdated(const std::set<std::string>& changedProperties) override;
/// @see \ref ManagedIceObject::icePropertiesInitialized
void icePropertiesInitialized() override;
/// @see \ref ManagedIceObject::getDefaultName
......@@ -360,8 +360,8 @@ namespace armarx
}
//module hooks
/// @brief Hook for deriving RobotUnitModules called in \ref icePropertiesUpdated
void _icePropertiesUpdated(const std::set<std::string>& changedProperties) {}
/// @brief Hook for deriving RobotUnitModules called in \ref componentPropertiesUpdated
void _componentPropertiesUpdated(const std::set<std::string>& /*changedProperties*/) {}
/// @brief Hook for deriving RobotUnitModules called in \ref icePropertiesInitialized
void _icePropertiesInitialized() {}
// //////////////////////////////////////////////////////////////////////////////////////// //
......
......@@ -395,7 +395,7 @@ namespace armarx
addPropertyUser(PropertyUserPtr::dynamicCast(robotUnitObserver));
}
void Publisher::_icePropertiesUpdated(const std::set<std::string>& changedProperties)
void Publisher::_componentPropertiesUpdated(const std::set<std::string>& changedProperties)
{
throwIfInControlThread(BOOST_CURRENT_FUNCTION);
if (changedProperties.count("ObserverPublishSensorValues"))
......
......@@ -96,8 +96,8 @@ namespace armarx
private:
/// @see ModuleBase::_icePropertiesInitialized
void _icePropertiesInitialized();
/// @see ModuleBase::_icePropertiesUpdated
void _icePropertiesUpdated(const std::set<std::string>& changedProperties);
/// @see ModuleBase::_componentPropertiesUpdated
void _componentPropertiesUpdated(const std::set<std::string>& changedProperties);
/// @see ModuleBase::_preOnInitRobotUnit
void _preOnInitRobotUnit();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment