From 2672e3aa3d7076a083a9a604a73fa27e3ea28617 Mon Sep 17 00:00:00 2001 From: stv Date: Thu, 21 Feb 2008 11:24:35 +0000 Subject: [PATCH] *** empty log message *** --- src/OBJECT/SMESH_Actor.cxx | 2 ++ src/OBJECT/SMESH_ActorUtils.cxx | 2 +- .../SMESH_LogicalFilter.cxx | 29 +++++++++---------- .../SMESH_LogicalFilter.hxx | 29 +++++++++---------- .../SMESH_NumberFilter.cxx | 2 +- .../SMESH_TypeFilter.cxx | 2 +- 6 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/OBJECT/SMESH_Actor.cxx b/src/OBJECT/SMESH_Actor.cxx index 06a9d822b..eefc25bf6 100644 --- a/src/OBJECT/SMESH_Actor.cxx +++ b/src/OBJECT/SMESH_Actor.cxx @@ -33,6 +33,8 @@ #include "SMESH_ControlsDef.hxx" #include "VTKViewer_ExtractUnstructuredGrid.h" +#include + #include "SUIT_Session.h" #include "SUIT_ResourceMgr.h" diff --git a/src/OBJECT/SMESH_ActorUtils.cxx b/src/OBJECT/SMESH_ActorUtils.cxx index e498c2f72..cee51d0fb 100644 --- a/src/OBJECT/SMESH_ActorUtils.cxx +++ b/src/OBJECT/SMESH_ActorUtils.cxx @@ -42,7 +42,7 @@ namespace SMESH GetFloat( const QString& theValue, vtkFloatingPointType theDefault ) { - int pos = theValue.find( ":" ); + int pos = theValue.indexOf( ":" ); vtkFloatingPointType val = theDefault; if( pos>=0 ) { diff --git a/src/SMESHFiltersSelection/SMESH_LogicalFilter.cxx b/src/SMESHFiltersSelection/SMESH_LogicalFilter.cxx index 57cfea757..1495c9636 100644 --- a/src/SMESHFiltersSelection/SMESH_LogicalFilter.cxx +++ b/src/SMESHFiltersSelection/SMESH_LogicalFilter.cxx @@ -1,18 +1,18 @@ // 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/ or email : webmaster.salome@opencascade.com @@ -26,10 +26,10 @@ // name : SMESH_LogicalFilter::SMESH_LogicalFilter // Purpose : Constructor //======================================================================= -SMESH_LogicalFilter::SMESH_LogicalFilter (const QPtrList& theFilters, +SMESH_LogicalFilter::SMESH_LogicalFilter (const QList& 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 it (myFilters); - SUIT_SelectionFilter* filter; - for (; ((filter = it.current()) != 0) && res; ++it) + for ( QList::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& theFilters) +void SMESH_LogicalFilter::setFilters (const QList& 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 SMESH_LogicalFilter::getFilters() const +const QList SMESH_LogicalFilter::getFilters() const { return myFilters; } diff --git a/src/SMESHFiltersSelection/SMESH_LogicalFilter.hxx b/src/SMESHFiltersSelection/SMESH_LogicalFilter.hxx index a6197ab82..5aabbbba3 100644 --- a/src/SMESHFiltersSelection/SMESH_LogicalFilter.hxx +++ b/src/SMESHFiltersSelection/SMESH_LogicalFilter.hxx @@ -1,18 +1,18 @@ // 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/ or email : webmaster.salome@opencascade.com @@ -27,7 +27,7 @@ #include -#include +#include class SMESHFILTERSSELECTION_EXPORT SMESH_LogicalFilter : public SUIT_SelectionFilter { @@ -35,20 +35,19 @@ class SMESHFILTERSSELECTION_EXPORT SMESH_LogicalFilter : public SUIT_SelectionFi enum { LO_OR, LO_AND, LO_NOT, LO_UNDEFINED }; public: - SMESH_LogicalFilter (const QPtrList&, - const int); + SMESH_LogicalFilter( const QList&, const int ); virtual ~SMESH_LogicalFilter(); virtual bool isOk (const SUIT_DataOwner*) const; - void setFilters (const QPtrList&); + void setFilters (const QList&); void setOperation (const int); - const QPtrList getFilters() const; + const QList getFilters() const; int getOperation() const; private: - QPtrList myFilters; - int myOperation; + QList myFilters; + int myOperation; }; #endif diff --git a/src/SMESHFiltersSelection/SMESH_NumberFilter.cxx b/src/SMESHFiltersSelection/SMESH_NumberFilter.cxx index 36a091c72..6862c7004 100644 --- a/src/SMESHFiltersSelection/SMESH_NumberFilter.cxx +++ b/src/SMESHFiltersSelection/SMESH_NumberFilter.cxx @@ -165,7 +165,7 @@ GEOM::GEOM_Object_ptr SMESH_NumberFilter::getGeom _PTR(Study) study = appStudy->studyDS(); QString entry = owner->entry(); - _PTR(SObject) aSO( study->FindObjectID( entry.latin1() ) ), aRefSO; + _PTR(SObject) aSO( study->FindObjectID( (const char*)entry.toLatin1() ) ), aRefSO; if( extractReference && aSO && aSO->ReferencedObject( aRefSO ) ) aSO = aRefSO; diff --git a/src/SMESHFiltersSelection/SMESH_TypeFilter.cxx b/src/SMESHFiltersSelection/SMESH_TypeFilter.cxx index 3770b4a85..a19eb93fc 100644 --- a/src/SMESHFiltersSelection/SMESH_TypeFilter.cxx +++ b/src/SMESHFiltersSelection/SMESH_TypeFilter.cxx @@ -50,7 +50,7 @@ bool SMESH_TypeFilter::isOk (const SUIT_DataOwner* theDataOwner) const _PTR(Study) study = appStudy->studyDS(); QString entry = owner->entry(); - _PTR(SObject) obj (study->FindObjectID(entry.latin1())), aRefSO; + _PTR(SObject) obj (study->FindObjectID((const char*)entry.toLatin1())), aRefSO; if( extractReference && obj && obj->ReferencedObject( aRefSO ) ) obj = aRefSO; if (!obj) return false; -- 2.39.2