From b32d2b27706fce6f855cabc8a81ca698ef99004b Mon Sep 17 00:00:00 2001 From: Mirko Waechter <mirko.waechter@kit.edu> Date: Tue, 30 Oct 2012 13:20:50 +0000 Subject: [PATCH] Adapted RobotStatechartContext to new StatechartContext git-svn-id: https://svn.sfb588.uni-karlsruhe.de/svn/HumanoidRobotAPI@15 e7ad446d-f7d8-486a-9efb-df2f5bbea5c6 --- source/HumanoidRobotAPI/core/RobotStatechartContext.cpp | 4 ++-- source/HumanoidRobotAPI/core/RobotStatechartContext.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/HumanoidRobotAPI/core/RobotStatechartContext.cpp b/source/HumanoidRobotAPI/core/RobotStatechartContext.cpp index 6e5d89087..55e685d53 100644 --- a/source/HumanoidRobotAPI/core/RobotStatechartContext.cpp +++ b/source/HumanoidRobotAPI/core/RobotStatechartContext.cpp @@ -38,7 +38,7 @@ namespace armarx // **************************************************************** // Implementation of Component // **************************************************************** - void RobotStatechartContext::onInitStatechart() + void RobotStatechartContext::onInitStatechartContext() { // StatechartContext::onInitStatechart(); ARMARX_LOG << eINFO << "Init Armar4Context" << flush; @@ -52,7 +52,7 @@ namespace armarx } - void RobotStatechartContext::onConnectStatechart() + void RobotStatechartContext::onConnectStatechartContext() { // StatechartContext::onConnectStatechart(); ARMARX_LOG << eINFO << "Starting Armar4Context" << flush; diff --git a/source/HumanoidRobotAPI/core/RobotStatechartContext.h b/source/HumanoidRobotAPI/core/RobotStatechartContext.h index e579736d5..ff49f0520 100644 --- a/source/HumanoidRobotAPI/core/RobotStatechartContext.h +++ b/source/HumanoidRobotAPI/core/RobotStatechartContext.h @@ -63,8 +63,8 @@ namespace armarx public: // inherited from Component virtual std::string getDefaultName() { return "RobotStatechartContext"; }; - virtual void onInitStatechart(); - virtual void onConnectStatechart(); + virtual void onInitStatechartContext(); + virtual void onConnectStatechartContext(); // todo:read access should only be allowed via const getters ?! //const VirtualRobot::RobotPtr getRobot(); -- GitLab