diff --git a/source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleBase.cpp b/source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleBase.cpp index fdf0eb95d39f402d56e9879024927fa16dc082c2..a8790aceb5e97dc1e60023e51d1528a340d6dd38 100644 --- a/source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleBase.cpp +++ b/source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleBase.cpp @@ -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 } diff --git a/source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleBase.h b/source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleBase.h index fccfea23db850e4686c6421eddbf57a1b9852e9c..7cc6baa74ccbc14fd73d1958f0b26710b02d807b 100644 --- a/source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleBase.h +++ b/source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleBase.h @@ -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() {} // //////////////////////////////////////////////////////////////////////////////////////// // diff --git a/source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModulePublisher.cpp b/source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModulePublisher.cpp index a4f8bdae7b30e1e9600aaf9539b347b441fcc44c..a65da44404bd79896b6805a427abc4fe25019b60 100644 --- a/source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModulePublisher.cpp +++ b/source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModulePublisher.cpp @@ -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")) diff --git a/source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModulePublisher.h b/source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModulePublisher.h index 89fe1e8acd877d42b0cb4abc020df5c88dd13077..925c935ab1aa9e4e7d358b901ec54a735ce28502 100644 --- a/source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModulePublisher.h +++ b/source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModulePublisher.h @@ -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();