Using LightApp_SelectionMgr instead SalomeApp_SelectionMgr, and

LightApp_DataOwner instead SalomeApp_DataOwner.

diff --git a/src/GEOMFiltersSelection/GEOM_OCCFilter.cxx b/src/GEOMFiltersSelection/GEOM_OCCFilter.cxx
index 6f22d93c18f7a1d61549e217a176d59b0d5acb0e..95367104555907462b8e3d1702c925caf09187db 100644 (file)
--- a/src/GEOMFiltersSelection/GEOM_OCCFilter.cxx
+++ b/src/GEOMFiltersSelection/GEOM_OCCFilter.cxx
@@ -1,7 +1,7 @@
 #include "GEOM_OCCFilter.h"
 
-#include <SalomeApp_SelectionMgr.h> 
-#include <SalomeApp_DataOwner.h>
+#include <LightApp_SelectionMgr.h> 
+#include <LightApp_DataOwner.h>
 
 #include <SALOME_InteractiveObject.hxx>
 
@@ -15,7 +15,7 @@ IMPLEMENT_STANDARD_RTTIEXT(GEOM_OCCFilter, SelectMgr_Filter)
 // function : GEOM_OCCFilter
 // purpose  : 
 //=======================================================================
-GEOM_OCCFilter::GEOM_OCCFilter( SalomeApp_SelectionMgr* theSelMgr )
+GEOM_OCCFilter::GEOM_OCCFilter( LightApp_SelectionMgr* theSelMgr )
   : SelectMgr_Filter()
 {
   mySelMgr = theSelMgr;
@@ -42,5 +42,5 @@ Standard_Boolean GEOM_OCCFilter::IsOk( const Handle(SelectMgr_EntityOwner)& anOb
   Handle(SALOME_InteractiveObject) anIO = Handle(SALOME_InteractiveObject)::DownCast(anAIS->GetOwner()); 
   if ( anIO.IsNull() ) return false;
   
-  return mySelMgr->isOk( new SalomeApp_DataOwner( QString( anIO->getEntry() ) ) );
+  return mySelMgr->isOk( new LightApp_DataOwner( QString( anIO->getEntry() ) ) );
 }

diff --git a/src/GEOMFiltersSelection/GEOM_OCCFilter.h b/src/GEOMFiltersSelection/GEOM_OCCFilter.h
index b19764305618d506d3ae2825cc575045eb2c3e8b..2d477ccab44dcb6ec27d56615002127bc6c53dfb 100644 (file)
--- a/src/GEOMFiltersSelection/GEOM_OCCFilter.h
+++ b/src/GEOMFiltersSelection/GEOM_OCCFilter.h
@@ -5,18 +5,18 @@
 
 #include <Standard_DefineHandle.hxx>
 
-class SalomeApp_SelectionMgr;
+class LightApp_SelectionMgr;
 
 class GEOM_OCCFilter : public SelectMgr_Filter
 {
 public:
-  Standard_EXPORT GEOM_OCCFilter( SalomeApp_SelectionMgr* theSelMgr);
+  Standard_EXPORT GEOM_OCCFilter( LightApp_SelectionMgr* theSelMgr);
   Standard_EXPORT ~GEOM_OCCFilter();
   
   Standard_EXPORT virtual Standard_Boolean IsOk( const Handle(SelectMgr_EntityOwner)& anObj ) const;
     
 private:
-  SalomeApp_SelectionMgr* mySelMgr;
+  LightApp_SelectionMgr* mySelMgr;
 
 public:
   

diff --git a/src/GEOMFiltersSelection/GEOM_PreviewFilter.cxx b/src/GEOMFiltersSelection/GEOM_PreviewFilter.cxx
index 815ff81cb012695d78efa923d203038d45609020..ae7543320602c4419504573310a2781b9ac869d3 100644 (file)
--- a/src/GEOMFiltersSelection/GEOM_PreviewFilter.cxx
+++ b/src/GEOMFiltersSelection/GEOM_PreviewFilter.cxx
@@ -1,6 +1,6 @@
 #include "GEOM_PreviewFilter.h"
 
-#include <SalomeApp_DataOwner.h>
+#include <LightApp_DataOwner.h>
 
 //=======================================================================
 // function : GEOM_SelectionFilter
@@ -25,7 +25,7 @@ GEOM_PreviewFilter::~GEOM_PreviewFilter()
 //=======================================================================
 bool GEOM_PreviewFilter::isOk( const SUIT_DataOwner* sOwner ) const
 {
-  const SalomeApp_DataOwner* owner = dynamic_cast<const SalomeApp_DataOwner*> ( sOwner );
+  const LightApp_DataOwner* owner = dynamic_cast<const LightApp_DataOwner*> ( sOwner );
   return ( owner && strstr( owner->entry(), "TEMP" ) );
 }
 

diff --git a/src/GEOMFiltersSelection/GEOM_SelectionFilter.cxx b/src/GEOMFiltersSelection/GEOM_SelectionFilter.cxx
index b880fd3b497305d42a23aeea294c4f5b4bc38744..7d25b9c7c92a7c933a1a087dad825010a43a8f05 100644 (file)
--- a/src/GEOMFiltersSelection/GEOM_SelectionFilter.cxx
+++ b/src/GEOMFiltersSelection/GEOM_SelectionFilter.cxx
@@ -2,7 +2,7 @@
 
 #include "GEOM_Client.hxx"
 
-#include <SalomeApp_DataOwner.h>
+#include <LightApp_DataOwner.h>
 #include <SalomeApp_Study.h>
 #include <SalomeApp_Application.h>
 
@@ -58,7 +58,7 @@ GEOM::GEOM_Object_ptr GEOM_SelectionFilter::getObject (const SUIT_DataOwner* sOw
 {
   GEOM::GEOM_Object_var anObj;
 
-  const SalomeApp_DataOwner* owner = dynamic_cast<const SalomeApp_DataOwner*>(sOwner);
+  const LightApp_DataOwner* owner = dynamic_cast<const LightApp_DataOwner*>(sOwner);
   SalomeApp_Study* appStudy = getStudy();
   if (owner && appStudy)
   {