*** empty log message ***

[modules/smesh.git] / src / SMESHFiltersSelection / SMESH_LogicalFilter.cxx

diff --git a/src/SMESHFiltersSelection/SMESH_LogicalFilter.cxx b/src/SMESHFiltersSelection/SMESH_LogicalFilter.cxx
index 5033f8e1390e6c8fb9760d026643e1eb6dc501c8..1495c9636915ca6db4cbc318b625370d64e97bf6 100644 (file)
--- a/src/SMESHFiltersSelection/SMESH_LogicalFilter.cxx
+++ b/src/SMESHFiltersSelection/SMESH_LogicalFilter.cxx
@@ -1,21 +1,21 @@
 // Copyright (C) 2005  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 
+// License as published by the Free Software Foundation; either
 // version 2.1 of the License.
-// 
-// 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 
+//
+// 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 
+// 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/
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //  File   : SMESH_LogicalFilter.cxx
 //  Module : SMESH
@@ -26,10 +26,10 @@
 // name    : SMESH_LogicalFilter::SMESH_LogicalFilter
 // Purpose : Constructor
 //=======================================================================
-SMESH_LogicalFilter::SMESH_LogicalFilter (const QPtrList<SUIT_SelectionFilter>& theFilters,
+SMESH_LogicalFilter::SMESH_LogicalFilter (const QList<SUIT_SelectionFilter*>& theFilters,
                                           const int                             theLogOp)
 {
-  setFilters(theFilters); 
+  setFilters(theFilters);
   setOperation(theLogOp);
 }
 
@@ -48,10 +48,9 @@ SMESH_LogicalFilter::~SMESH_LogicalFilter()
 bool SMESH_LogicalFilter::isOk (const SUIT_DataOwner* owner) const
 {
   bool res = true;
-  QPtrListIterator<SUIT_SelectionFilter> it (myFilters);
-  SUIT_SelectionFilter* filter;
-  for (; ((filter = it.current()) != 0) && res; ++it)
+  for ( QList<SUIT_SelectionFilter*>::const_iterator it = myFilters.begin(); it != myFilters.end() && res; ++it )
   {
+    SUIT_SelectionFilter* filter = *it;
     if (myOperation == LO_OR && filter->isOk(owner))
       return true;
     if (myOperation == LO_AND && !filter->isOk(owner))
@@ -67,7 +66,7 @@ bool SMESH_LogicalFilter::isOk (const SUIT_DataOwner* owner) const
 // name    : SMESH_LogicalFilter::setFilters
 // Purpose : Set new list of filters. Old wilters are removed
 //=======================================================================
-void SMESH_LogicalFilter::setFilters (const QPtrList<SUIT_SelectionFilter>& theFilters)
+void SMESH_LogicalFilter::setFilters (const QList<SUIT_SelectionFilter*>& theFilters)
 {
   myFilters = theFilters;
 }
@@ -85,7 +84,7 @@ void SMESH_LogicalFilter::setOperation (const int theLogOp)
 // name    : SMESH_LogicalFilter::getFilters
 // Purpose : Get list of filters
 //=======================================================================
-const QPtrList<SUIT_SelectionFilter> SMESH_LogicalFilter::getFilters() const
+const QList<SUIT_SelectionFilter*> SMESH_LogicalFilter::getFilters() const
 {
   return myFilters;
 }