From 8634e1b869fc32bb9883d76c58de115aea059883 Mon Sep 17 00:00:00 2001 From: System User Date: Tue, 26 Jan 2010 11:35:29 +0100 Subject: [PATCH] * rename PseudoAxesAdapter::update_state_and_status_i -> update --- src/PseudoAxesAdapter.cpp | 2 +- src/PseudoAxesAdapter.h | 2 +- src/TangoHKLAdapter.cpp | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/PseudoAxesAdapter.cpp b/src/PseudoAxesAdapter.cpp index bdbcab2..56b4e60 100644 --- a/src/PseudoAxesAdapter.cpp +++ b/src/PseudoAxesAdapter.cpp @@ -162,7 +162,7 @@ namespace Diffractometer_ns } } - void PseudoAxesAdapter::update_state_and_status_i(void) + void PseudoAxesAdapter::update(void) { std::string status_extra; diff --git a/src/PseudoAxesAdapter.h b/src/PseudoAxesAdapter.h index d47a7d0..829d59e 100644 --- a/src/PseudoAxesAdapter.h +++ b/src/PseudoAxesAdapter.h @@ -80,7 +80,7 @@ namespace Diffractometer_ns { std::string _status; void update_axes_i(HklPseudoAxisEngine *engine); - void update_state_and_status_i(void); + void update(void); void load_1(void); }; } diff --git a/src/TangoHKLAdapter.cpp b/src/TangoHKLAdapter.cpp index 309cca3..6fe4ec4 100644 --- a/src/TangoHKLAdapter.cpp +++ b/src/TangoHKLAdapter.cpp @@ -482,8 +482,7 @@ namespace Diffractometer_ns adapter->_write.data[j] = hkl_parameter_get_value_unit((HklParameter *)engine_w->pseudoAxes[j]); } - - adapter->update_state_and_status_i(); + adapter->update(); } } -- 2.11.4.GIT