2 servant implementations of GEOM::GEOM_GEN. One with Study and ModuleCatalog retrive...

[modules/geom.git] / src / GEOMFiltersSelection / GEOM_LogicalFilter.cxx

diff --git a/src/GEOMFiltersSelection/GEOM_LogicalFilter.cxx b/src/GEOMFiltersSelection/GEOM_LogicalFilter.cxx
index 22ca76a26e43ee659be576981776738a3757f7bd..e010cae628ebae14e858c0ac5e6865fe09432480 100644 (file)
--- a/src/GEOMFiltersSelection/GEOM_LogicalFilter.cxx
+++ b/src/GEOMFiltersSelection/GEOM_LogicalFilter.cxx
@@ -1,10 +1,32 @@
+// Copyright (C) 2007-2020  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
 #include "GEOM_LogicalFilter.h"
 
 //=======================================================================
 // function : GEOM_LogicalFilter
 // purpose  : 
 //=======================================================================
-GEOM_LogicalFilter::GEOM_LogicalFilter( const QPtrList<SUIT_SelectionFilter>& lst, const int op )
+GEOM_LogicalFilter::GEOM_LogicalFilter( const QList<SUIT_SelectionFilter*>& lst, const int op )
 : SUIT_SelectionFilter()
 {
   setFilters( lst ); 
@@ -26,8 +48,12 @@ GEOM_LogicalFilter::~GEOM_LogicalFilter()
 bool GEOM_LogicalFilter::isOk( const SUIT_DataOwner* owner ) const
 {
   GEOM_LogicalFilter* non_const_this = (GEOM_LogicalFilter*)this;
-  for ( SUIT_SelectionFilter* filter = non_const_this->myFilters.first(); filter; filter = non_const_this->myFilters.next() )
+  QListIterator<SUIT_SelectionFilter*> it( non_const_this->myFilters );
+  while ( it.hasNext() )
   {
+    SUIT_SelectionFilter* filter = it.next();
+    if ( !filter ) continue;
+
     if ( myOperation == LO_OR && filter->isOk( owner ) )
       return true;
     if ( myOperation == LO_AND && !filter->isOk( owner ) )
@@ -43,7 +69,7 @@ bool GEOM_LogicalFilter::isOk( const SUIT_DataOwner* owner ) const
 // function : setFilters
 // purpose  : 
 //=======================================================================
-void GEOM_LogicalFilter::setFilters( const QPtrList<SUIT_SelectionFilter>& lst )
+void GEOM_LogicalFilter::setFilters( const QList<SUIT_SelectionFilter*>& lst )
 {
   myFilters = lst;
 }
@@ -61,7 +87,7 @@ void GEOM_LogicalFilter::setOperation( const int op )
 // function : getFilters
 // purpose  : 
 //=======================================================================
-QPtrList<SUIT_SelectionFilter> GEOM_LogicalFilter::getFilters() const 
+QList<SUIT_SelectionFilter*> GEOM_LogicalFilter::getFilters() const 
 {
   return myFilters;
 }