Удалил "хак" - функцию getObjectType

include/IOController.h

@@ -45,7 +45,7 @@ class IOController:
         IOController(UniSetTypes::ObjectId id);
         ~IOController();
 
-        virtual UniSetTypes::ObjectType getType(){ return UniSetTypes::getObjectType("IOController"); }
+        virtual UniSetTypes::ObjectType getType(){ return UniSetTypes::ObjectType("IOController"); }
 
         virtual CORBA::Long getValue( const IOController_i::SensorInfo& si );
 

include/IONotifyController.h

@@ -136,8 +136,7 @@ class IONotifyController:
 
         virtual ~IONotifyController();
 
-        virtual UniSetTypes::ObjectType getType(){ return UniSetTypes::getObjectType("IONotifyController"); }
-
+        virtual UniSetTypes::ObjectType getType(){ return UniSetTypes::ObjectType("IONotifyController"); }
         virtual void askSensor(const IOController_i::SensorInfo& si, const UniSetTypes::ConsumerInfo& ci, UniversalIO::UIOCommand cmd);
 
         virtual void askThreshold(const IOController_i::SensorInfo& si, const UniSetTypes::ConsumerInfo& ci,

include/UniSetActivator.h

@@ -59,7 +59,7 @@ class UniSetActivator:
 
         inline void oakill(int signo){ raise(signo);}
 
-        virtual UniSetTypes::ObjectType getType(){ return UniSetTypes::getObjectType("UniSetActivator"); }
+        virtual UniSetTypes::ObjectType getType(){ return UniSetTypes::ObjectType("UniSetActivator"); }
 
     protected:
 

include/UniSetManager.h

@@ -62,7 +62,7 @@ class UniSetManager:
         UniSetManager( const std::string& name, const std::string& section );
         virtual ~UniSetManager();
 
-        virtual UniSetTypes::ObjectType getType(){ return UniSetTypes::getObjectType("UniSetManager"); }
+        virtual UniSetTypes::ObjectType getType(){ return UniSetTypes::ObjectType("UniSetManager"); }
 
         // ------  функции объявленные в интерфейсе(IDL) ------
         virtual void broadcast(const UniSetTypes::TransportMessage& msg);

include/UniSetObject.h

@@ -74,9 +74,10 @@ class UniSetObject:
         virtual CORBA::Boolean exist();
         virtual char* getName(){return (char*)myname.c_str();}
         virtual UniSetTypes::ObjectId getId(){ return myid; }
-        const UniSetTypes::ObjectId getId() const { return myid; }
 
-        virtual UniSetTypes::ObjectType getType() { return UniSetTypes::getObjectType("UniSetObject"); }
+        inline const UniSetTypes::ObjectId getId() const { return myid; }
+
+        virtual UniSetTypes::ObjectType getType() { return UniSetTypes::ObjectType("UniSetObject"); }
         virtual UniSetTypes::SimpleInfo* getInfo();
         friend std::ostream& operator<<(std::ostream& os, UniSetObject& obj );
 

include/UniSetTypes.h

@@ -81,9 +81,6 @@ namespace UniSetTypes
     typedef CORBA::Object_ptr ObjectPtr;    /*!< Ссылка на объект регистрируемый в ObjectRepository */
     typedef CORBA::Object_var ObjectVar;    /*!< Ссылка на объект регистрируемый в ObjectRepository */
 
-    /*! Функция делает ObjectType из const char * (переводит const-строку в обычную, что плохо, но мы обещаем не писать в неё :) )  */
-    inline static UniSetTypes::ObjectType getObjectType(const char * name) { const void *t = name;  return (UniSetTypes::ObjectType)t; }
-
     UniversalIO::IOType getIOType( const std::string& s );
     std::ostream& operator<<( std::ostream& os, const UniversalIO::IOType t );