Rename Engines::Component to Engines::EngineComponent

diff --git a/Examples/cppgui1/cppcomposGUI.cxx b/Examples/cppgui1/cppcomposGUI.cxx
index 47df890b7aa968118f8bbe2dbb0be21e7651d048..676e6551f190fa46024cf6c144541d086841062c 100644 (file)
--- a/Examples/cppgui1/cppcomposGUI.cxx
+++ b/Examples/cppgui1/cppcomposGUI.cxx
@@ -38,7 +38,7 @@ void cppcomposGUI::initialize( CAM_Application* app )
 
   SalomeApp_Module::initialize( app );
 
-  Engines::Component_var comp = dynamic_cast<SalomeApp_Application*>(app)->lcc()->FindOrLoad_Component( "FactoryServer","cppcompos" );
+  Engines::EngineComponent_var comp = dynamic_cast<SalomeApp_Application*>(app)->lcc()->FindOrLoad_Component( "FactoryServer","cppcompos" );
   engine = cppcompos_ORB::cppcompos::_narrow(comp);
 
   QWidget* aParent = application()->desktop();

diff --git a/module_generator/cpp_tmpl.py b/module_generator/cpp_tmpl.py
index cf028bae44a86f74c6d6094307315064ffe52c6c..aa604a34892c28b182574dac0e985df785e0190a 100644 (file)
--- a/module_generator/cpp_tmpl.py
+++ b/module_generator/cpp_tmpl.py
@@ -236,7 +236,7 @@ extern "C"
         ${component}_i * myEngine = new ${component}_i(orb, poa, container, instanceName.c_str(), "${component}");
         pman->activate();
         obj=myEngine->POA_${module}_ORB::${component}::_this();
-        Engines::Component_var component = Engines::Component::_narrow(obj);
+        Engines::EngineComponent_var component = Engines::EngineComponent::_narrow(obj);
         string component_registerName = containerName + "/" + instanceName;
         salomens->Register(component,component_registerName.c_str());
         orb->run();
@@ -415,4 +415,3 @@ lib${component}Exelib_la_LIBADD   = ${libs} -L$$(top_builddir)/idl -lSalomeIDL${
 lib${component}Exelib_la_LDFLAGS = ${rlibs}
 """
 compoEXEMakefile=Template(compoEXEMakefile)
-

diff --git a/module_generator/hxx_tmpl.py b/module_generator/hxx_tmpl.py
index 3e25a10fef42b3997a12813cc9755955b8df8526..1914b2b9340be65d367bb37e4f257fe91f4827a7 100644 (file)
--- a/module_generator/hxx_tmpl.py
+++ b/module_generator/hxx_tmpl.py
@@ -68,7 +68,7 @@ char* ${component}_i::ComponentDataType()
       return CORBA::string_dup("${component}");
 }
 
-Engines::Component_ptr ${component}_i::GetComponentInstance()
+Engines::EngineComponent_ptr ${component}_i::GetComponentInstance()
 {
       return ${component}_Gen::_this();
 }
@@ -125,7 +125,7 @@ public:
 ${servicesdef}
 
 // (re)defined methods of Driver
-    virtual Engines::Component_ptr GetComponentInstance();
+    virtual Engines::EngineComponent_ptr GetComponentInstance();
     char* ComponentDataType();
 
 private:
@@ -178,7 +178,7 @@ lib${component}Engine_la_LIBADD   = ${libs} -L$$(top_builddir)/idl -lSalomeIDL${
 
 #, SALOME_MED::MED_Gen_Driver, SALOME::MultiCommClass
 interfaceidlhxx="""
-  interface ${component}_Gen:Engines::Component,SALOME::MultiCommClass ${inherited}
+  interface ${component}_Gen:Engines::EngineComponent,SALOME::MultiCommClass ${inherited}
   {
 ${services}
   };

diff --git a/module_generator/paco_tmpl.py b/module_generator/paco_tmpl.py
index 72692caa1c642b6c0d48fc31e3b8afe2e331a48a..f136bad12a87c2f2e2f8c434723bd6ec5bea51ea 100644 (file)
--- a/module_generator/paco_tmpl.py
+++ b/module_generator/paco_tmpl.py
@@ -162,12 +162,12 @@ ${component}_i::${component}_i(CORBA::ORB_ptr orb,
   InterfaceParallel_impl(orb,ior, rank),
   Engines::Superv_Component_serv(orb, ior, rank),
   Engines::DSC_serv(orb, ior, rank), 
-  Engines::Component_serv(orb,ior, rank), 
+  Engines::EngineComponent_serv(orb,ior, rank), 
   Engines::Parallel_Component_serv(orb,ior, rank), 
   Engines::Parallel_DSC_base_serv(orb, ior, rank),
   Engines::Superv_Component_base_serv(orb, ior, rank),
   Engines::DSC_base_serv(orb, ior, rank), 
-  Engines::Component_base_serv(orb,ior, rank), 
+  Engines::EngineComponent_base_serv(orb,ior, rank), 
   Engines::Parallel_Component_base_serv(orb,ior, rank) 
 
 {