X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHFiltersSelection%2FSMESH_LogicalFilter.hxx;h=ddaaeb9432e17d5624ceffeaa7901d07269549db;hb=14e837696393fd873427c02268fffe8925c88b0c;hp=a6197ab82491768579fcd683dc886087f20a5ac0;hpb=79b1ac2b6df9117f16f11d444b1f165d477a1813;p=modules%2Fsmesh.git

diff --git a/src/SMESHFiltersSelection/SMESH_LogicalFilter.hxx b/src/SMESHFiltersSelection/SMESH_LogicalFilter.hxx
index a6197ab82..ddaaeb943 100644
--- a/src/SMESHFiltersSelection/SMESH_LogicalFilter.hxx
+++ b/src/SMESHFiltersSelection/SMESH_LogicalFilter.hxx
@@ -1,25 +1,28 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// Copyright (C) 2007-2013  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 
+// 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/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : SMESH_LogicalFilter.hxx
 //  Module : SMESH
-
+//
 #ifndef _SMESH_LogicalFilter_HeaderFile
 #define _SMESH_LogicalFilter_HeaderFile
 
@@ -27,7 +30,7 @@
 
 #include <SUIT_SelectionFilter.h>
 
-#include <qptrlist.h>
+#include <QList>
 
 class SMESHFILTERSSELECTION_EXPORT SMESH_LogicalFilter : public SUIT_SelectionFilter
 {
@@ -35,20 +38,23 @@ class SMESHFILTERSSELECTION_EXPORT SMESH_LogicalFilter : public SUIT_SelectionFi
   enum { LO_OR, LO_AND, LO_NOT, LO_UNDEFINED };
 
  public:
-  SMESH_LogicalFilter (const QPtrList<SUIT_SelectionFilter>&,
-                       const int);
+  SMESH_LogicalFilter( const QList<SUIT_SelectionFilter*>&, const int, bool takeOwnership=false );
   virtual ~SMESH_LogicalFilter();
 
   virtual bool isOk (const SUIT_DataOwner*) const;
 
-  void                                 setFilters (const QPtrList<SUIT_SelectionFilter>&);
+  void                                 setFilters (const QList<SUIT_SelectionFilter*>&);
   void                                 setOperation (const int);
-  const QPtrList<SUIT_SelectionFilter> getFilters() const;
+  const QList<SUIT_SelectionFilter*>   getFilters() const;
   int                                  getOperation() const;
 
 private:
-  QPtrList<SUIT_SelectionFilter>  myFilters;
-  int                             myOperation;
+  void                          deleteFilters();
+
+private:
+  QList<SUIT_SelectionFilter*>  myFilters;
+  int                           myOperation;
+  bool                          myOwnership;
 };
 
 #endif