Rename Engines::Component to Engines::EngineComponent

diff --git a/idl/SalomeApp_Engine.idl b/idl/SalomeApp_Engine.idl
index 17f323ae8c58bc352e982a1d34281a8fafc86786..88076c72afdf2d5aa92dc808ac48d92b2a9d772a 100644 (file)
--- a/idl/SalomeApp_Engine.idl
+++ b/idl/SalomeApp_Engine.idl
@@ -19,10 +19,9 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 //  File   : SalomeApp_Engine.idl
 //  Author : Alexander SLADKOV
-//
+
 #ifndef __SalomeApp_Engine__
 #define __SalomeApp_Engine__
 
@@ -36,7 +35,7 @@ module SalomeApp
    *  SalomeApp::Engine: special CORBA pseudo-engine for persistance needs of components
    *  with no CORBA-based Engine.
    */
-  interface Engine : Engines::Component, 
+  interface Engine : Engines::EngineComponent, 
                      SALOMEDS::Driver
   {
   };

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx b/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx
index 9c507481ea04d8a15d73bbeae60f5f428ed0a900..2e5174ffcc9a432cecbff4a9f00700f2e66a9526 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx
@@ -19,10 +19,9 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 // File   : SALOME_PYQT_Module.cxx
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
-//
+
 #include <PyInterp_Dispatcher.h>
 
 #include "SALOME_PYQT_Module.h"
@@ -101,9 +100,9 @@ SALOME_PYQT_Module::~SALOME_PYQT_Module()
 /*!
  * Get module engine, returns nil var if engine is not found in LifeCycleCORBA
  */
-Engines::Component_var SALOME_PYQT_Module::getEngine() const
+Engines::EngineComponent_var SALOME_PYQT_Module::getEngine() const
 {
-  Engines::Component_var comp;
+  Engines::EngineComponent_var comp;
   // temporary solution
   try {
     comp = getApp()->lcc()->FindOrLoad_Component( "FactoryServerPy", name().toLatin1() );

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.h b/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.h
index 8660ecc4d1cceb35c8016d21a3dc18a4f29e5f79..9d01506dc5d7b87f95bb45665aa6fb887d0d0662 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.h
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.h
@@ -19,10 +19,9 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 // File   : SALOME_PYQT_Module.h
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
-//
+
 #ifndef SALOME_PYQT_MODULE_H
 #define SALOME_PYQT_MODULE_H
 
@@ -62,7 +61,7 @@ protected:
   /* create data model */
   virtual CAM_DataModel*     createDataModel();
 
-  Engines::Component_var     getEngine() const;
+  Engines::EngineComponent_var getEngine() const;
 
 private:
   void                       getEngineIOR();

diff --git a/src/SalomeApp/SalomeApp_DataObject.cxx b/src/SalomeApp/SalomeApp_DataObject.cxx
index a4a1232ddf3fa33d97447caae6f6dc29a0e74eb4..6464dcb90513dbe914297205e58c8317cebec02b 100644 (file)
--- a/src/SalomeApp/SalomeApp_DataObject.cxx
+++ b/src/SalomeApp/SalomeApp_DataObject.cxx
@@ -19,10 +19,9 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 // File   : SalomeApp_DataObject.cxx
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
-//
+
 #include "SalomeApp_DataObject.h"
 #include "SalomeApp_Study.h"
 #include "SalomeApp_Application.h"
@@ -270,7 +269,7 @@ QString SalomeApp_DataObject::toolTip( const int /*id*/ ) const
       //     with any container name, on every machine available
       Engines::MachineParameters params;
       app->lcc()->preSet(params); // --- any container name, anywhere
-      Engines::Component_var aComponent =
+      Engines::EngineComponent_var aComponent =
         app->lcc()->FindComponent(params, componentDataType().toLatin1().constData() );
       
       if ( !CORBA::is_nil(aComponent) && aComponent->hasObjectInfo() ) {

diff --git a/src/Session/Session_Session_i.cxx b/src/Session/Session_Session_i.cxx
index 0525e9d366398dfc26690004b69f15fde5cfaae4..be3fdafc3e18b423090ddf8707c2c821f2ba0495 100755 (executable)
--- a/src/Session/Session_Session_i.cxx
+++ b/src/Session/Session_Session_i.cxx
@@ -19,13 +19,11 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 //  SALOME Session : implementation of Session.idl
 //  File   : SALOME_Session_i.cxx
 //  Author : Paul RASCLE, EDF
 //  Module : SALOME
-//  $Header$
-//
+
 #include "utilities.h"
 
 #include "Session_Session_i.hxx"
@@ -78,16 +76,16 @@ SALOME_Session_i::SALOME_Session_i(int argc,
 /*!
   returns Visu component
 */
-Engines::Component_ptr SALOME_Session_i::GetComponent(const char* theLibraryName)
+Engines::EngineComponent_ptr SALOME_Session_i::GetComponent(const char* theLibraryName)
 {
-  typedef Engines::Component_ptr TGetImpl(CORBA::ORB_ptr,
-                                          PortableServer::POA_ptr,
-                                          SALOME_NamingService*,QMutex*);
+  typedef Engines::EngineComponent_ptr TGetImpl(CORBA::ORB_ptr,
+                                                PortableServer::POA_ptr,
+                                                SALOME_NamingService*,QMutex*);
   OSD_SharedLibrary  aSharedLibrary(const_cast<char*>(theLibraryName));
   if(aSharedLibrary.DlOpen(OSD_RTLD_LAZY))
     if(OSD_Function anOSDFun = aSharedLibrary.DlSymb("GetImpl"))
       return ((TGetImpl (*)) anOSDFun)(_orb,_poa,_NS,_GUIMutex);
-  return Engines::Component::_nil();
+  return Engines::EngineComponent::_nil();
 }
 
 /*!

diff --git a/src/Session/Session_Session_i.hxx b/src/Session/Session_Session_i.hxx
index 23899f6681f357cf587da272366c93f050cbd42c..6eff4391387762c4a804031f86b6abe7e923ecb8 100755 (executable)
--- a/src/Session/Session_Session_i.hxx
+++ b/src/Session/Session_Session_i.hxx
@@ -19,13 +19,11 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 //  SALOME Session : implementation of Session.idl
 //  File   : Session_Session_i.hxx
 //  Author : Paul RASCLE, EDF
 //  Module : SALOME
-//  $Header$
-//
+
 #ifndef _SESSION_SESSION_I_HXX_
 #define _SESSION_SESSION_I_HXX_
 
@@ -55,7 +53,7 @@ public:
   void GetInterface();
 
   //! Return VISU component
-  Engines::Component_ptr GetComponent(const char* theLibraryName);
+  Engines::EngineComponent_ptr GetComponent(const char* theLibraryName);
 
   //! Stop the Session (must be idle): kill servant & server
   void StopSession();
@@ -95,4 +93,3 @@ protected:
 };
 
 #endif
-