Commit 33671334 authored by Vitaly Lipatov's avatar Vitaly Lipatov

use UniSetTypes::getObjectType for fix getType function

parent 3eef75a2
...@@ -47,7 +47,7 @@ class IOController: ...@@ -47,7 +47,7 @@ class IOController:
IOController(UniSetTypes::ObjectId id); IOController(UniSetTypes::ObjectId id);
~IOController(); ~IOController();
virtual UniSetTypes::ObjectType getType(){ return "IOController"; } virtual UniSetTypes::ObjectType getType(){ return UniSetTypes::getObjectType("IOController"); }
virtual CORBA::Boolean getState( const IOController_i::SensorInfo& si ); virtual CORBA::Boolean getState( const IOController_i::SensorInfo& si );
virtual CORBA::Long getValue( const IOController_i::SensorInfo& si ); virtual CORBA::Long getValue( const IOController_i::SensorInfo& si );
......
...@@ -52,7 +52,7 @@ class IONotifyController: ...@@ -52,7 +52,7 @@ class IONotifyController:
virtual ~IONotifyController(); virtual ~IONotifyController();
virtual UniSetTypes::ObjectType getType(){ return "IONotifyController"; } virtual UniSetTypes::ObjectType getType(){ return UniSetTypes::getObjectType("IONotifyController"); }
virtual void askSensor(const IOController_i::SensorInfo& si, const UniSetTypes::ConsumerInfo& ci, UniversalIO::UIOCommand cmd); virtual void askSensor(const IOController_i::SensorInfo& si, const UniSetTypes::ConsumerInfo& ci, UniversalIO::UIOCommand cmd);
virtual void askState(const IOController_i::SensorInfo& si, const UniSetTypes::ConsumerInfo& ci, UniversalIO::UIOCommand cmd); virtual void askState(const IOController_i::SensorInfo& si, const UniSetTypes::ConsumerInfo& ci, UniversalIO::UIOCommand cmd);
......
...@@ -85,7 +85,7 @@ class InfoServer: ...@@ -85,7 +85,7 @@ class InfoServer:
InfoServer( UniSetTypes::ObjectId id=UniSetTypes::DefaultObjectId, ISRestorer* d=0 ); InfoServer( UniSetTypes::ObjectId id=UniSetTypes::DefaultObjectId, ISRestorer* d=0 );
virtual ~InfoServer(); virtual ~InfoServer();
virtual UniSetTypes::ObjectType getType(){ return "InfoServer"; } virtual UniSetTypes::ObjectType getType(){ return UniSetTypes::getObjectType("InfoServer"); }
// IDL // IDL
......
...@@ -59,7 +59,7 @@ class ObjectsActivator: ...@@ -59,7 +59,7 @@ class ObjectsActivator:
inline void oakill(int signo){ raise(signo);} inline void oakill(int signo){ raise(signo);}
virtual UniSetTypes::ObjectType getType(){ return "ObjectsActivator"; } virtual UniSetTypes::ObjectType getType(){ return UniSetTypes::getObjectType("ObjectsActivator"); }
protected: protected:
......
...@@ -65,7 +65,7 @@ class ObjectsManager: ...@@ -65,7 +65,7 @@ class ObjectsManager:
virtual ~ObjectsManager(); virtual ~ObjectsManager();
virtual UniSetTypes::ObjectType getType(){ return "ObjectsManager"; } virtual UniSetTypes::ObjectType getType(){ return UniSetTypes::getObjectType("ObjectsManager"); }
// ------ (IDL) ------ // ------ (IDL) ------
virtual void broadcast(const UniSetTypes::TransportMessage& msg); virtual void broadcast(const UniSetTypes::TransportMessage& msg);
......
...@@ -52,7 +52,7 @@ class SystemGuard: ...@@ -52,7 +52,7 @@ class SystemGuard:
virtual void oaDestroy(int signo=0); virtual void oaDestroy(int signo=0);
virtual UniSetTypes::SimpleInfo* getInfo(); virtual UniSetTypes::SimpleInfo* getInfo();
virtual UniSetTypes::ObjectType getType(){ return "SystemGuard"; } virtual UniSetTypes::ObjectType getType(){ return UniSetTypes::getObjectType("SystemGuard"); }
protected: protected:
......
...@@ -76,7 +76,7 @@ class UniSetObject: ...@@ -76,7 +76,7 @@ class UniSetObject:
virtual CORBA::Boolean exist(); virtual CORBA::Boolean exist();
virtual char* getName(){return (char*)myname.c_str();} virtual char* getName(){return (char*)myname.c_str();}
virtual UniSetTypes::ObjectId getId(){ return myid; } virtual UniSetTypes::ObjectId getId(){ return myid; }
virtual UniSetTypes::ObjectType getType() { static UniSetTypes::ObjectType ot("UniSetObject"); return ot; } virtual UniSetTypes::ObjectType getType() { return UniSetTypes::getObjectType("UniSetObject"); }
virtual UniSetTypes::SimpleInfo* getInfo(); virtual UniSetTypes::SimpleInfo* getInfo();
friend std::ostream& operator<<(std::ostream& os, UniSetObject& obj ); friend std::ostream& operator<<(std::ostream& os, UniSetObject& obj );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment