From: nds Date: Mon, 19 Sep 2005 05:56:39 +0000 (+0000) Subject: Using LightApp_SelectionMgr instead SalomeApp_SelectionMgr, and X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=0c20b44be3db39eee2e9db070b20314e45ab0c4b;p=modules%2Fgeom.git 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 6f22d93c1..953671045 100644 --- a/src/GEOMFiltersSelection/GEOM_OCCFilter.cxx +++ b/src/GEOMFiltersSelection/GEOM_OCCFilter.cxx @@ -1,7 +1,7 @@ #include "GEOM_OCCFilter.h" -#include -#include +#include +#include #include @@ -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 b19764305..2d477ccab 100644 --- a/src/GEOMFiltersSelection/GEOM_OCCFilter.h +++ b/src/GEOMFiltersSelection/GEOM_OCCFilter.h @@ -5,18 +5,18 @@ #include -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 815ff81cb..ae7543320 100644 --- a/src/GEOMFiltersSelection/GEOM_PreviewFilter.cxx +++ b/src/GEOMFiltersSelection/GEOM_PreviewFilter.cxx @@ -1,6 +1,6 @@ #include "GEOM_PreviewFilter.h" -#include +#include //======================================================================= // 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 ( sOwner ); + const LightApp_DataOwner* owner = dynamic_cast ( sOwner ); return ( owner && strstr( owner->entry(), "TEMP" ) ); } diff --git a/src/GEOMFiltersSelection/GEOM_SelectionFilter.cxx b/src/GEOMFiltersSelection/GEOM_SelectionFilter.cxx index b880fd3b4..7d25b9c7c 100644 --- a/src/GEOMFiltersSelection/GEOM_SelectionFilter.cxx +++ b/src/GEOMFiltersSelection/GEOM_SelectionFilter.cxx @@ -2,7 +2,7 @@ #include "GEOM_Client.hxx" -#include +#include #include #include @@ -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(sOwner); + const LightApp_DataOwner* owner = dynamic_cast(sOwner); SalomeApp_Study* appStudy = getStudy(); if (owner && appStudy) {