From 079f350810beef9497faf2f7bfbac42ac03ca86f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= Date: Mon, 15 Jun 2009 14:23:37 +0200 Subject: [PATCH] * few renames in the TangoHKLAdapterFActory --- src/Diffractometer/Diffractometer.cpp | 4 ++-- src/TangoHKLAdapterFactory.cpp | 4 ++-- src/TangoHKLAdapterFactory.h | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Diffractometer/Diffractometer.cpp b/src/Diffractometer/Diffractometer.cpp index ca09e81..632b672 100644 --- a/src/Diffractometer/Diffractometer.cpp +++ b/src/Diffractometer/Diffractometer.cpp @@ -208,7 +208,7 @@ void Diffractometer::delete_device() * during the save method call. Indeed the Derived class delete * method is called before this delete method. */ - TangoHKLAdapterFactory::instance()->detach_device(this); + TangoHKLAdapterFactory::instance()->detach_diffractometer_device(this); } //+---------------------------------------------------------------------------- @@ -282,7 +282,7 @@ void Diffractometer::init_device() * TangoHKLAdapter create the axisbuffer from the * realAxisProxies. */ - _hklAdapter = TangoHKLAdapterFactory::instance()->attach_device(this, _type); + _hklAdapter = TangoHKLAdapterFactory::instance()->attach_diffractometer_device(this, _type); if (!_hklAdapter) { this->set_state(Tango::FAULT); this->set_status("Fatal can not initialize the hkl library"); diff --git a/src/TangoHKLAdapterFactory.cpp b/src/TangoHKLAdapterFactory.cpp index 666c3cb..5411827 100644 --- a/src/TangoHKLAdapterFactory.cpp +++ b/src/TangoHKLAdapterFactory.cpp @@ -31,7 +31,7 @@ namespace Diffractometer_ns * @return an instance of hkl adapter which contains an instance of the library * */ - TangoHKLAdapter * TangoHKLAdapterFactory::attach_device( + TangoHKLAdapter * TangoHKLAdapterFactory::attach_diffractometer_device( Diffractometer *device, HklGeometryType type) { @@ -51,7 +51,7 @@ namespace Diffractometer_ns return adapter; } - void TangoHKLAdapterFactory::detach_device(Diffractometer *device) + void TangoHKLAdapterFactory::detach_diffractometer_device(Diffractometer *device) { // Find the name in map adapterMap_t::iterator iter; diff --git a/src/TangoHKLAdapterFactory.h b/src/TangoHKLAdapterFactory.h index af0b873..a856b65 100644 --- a/src/TangoHKLAdapterFactory.h +++ b/src/TangoHKLAdapterFactory.h @@ -32,10 +32,10 @@ namespace Diffractometer_ns public : static TangoHKLAdapterFactory *instance(void); - // Unregister diffractometer - TangoHKLAdapter * attach_device(Diffractometer *device, HklGeometryType type); + // register/unregister Diffractometer device + TangoHKLAdapter * attach_diffractometer_device(Diffractometer *device, HklGeometryType type); - void detach_device(Diffractometer *device); + void detach_diffractometer_device(Diffractometer *device); TangoHKLAdapter *get_diffractometer_adapter(std::string const & diffractometerProxyName); -- 2.11.4.GIT