*** empty log message ***

diff --git a/src/OBJECT/SMESH_Actor.cxx b/src/OBJECT/SMESH_Actor.cxx
index 06a9d822bbd6ba4db0e0086c89de157eaeebff6d..eefc25bf68be392b008b2df1f0b42952ab5b4066 100644 (file)
--- 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 <SALOME_InteractiveObject.hxx>
+
 #include "SUIT_Session.h"
 #include "SUIT_ResourceMgr.h"
 

diff --git a/src/OBJECT/SMESH_ActorUtils.cxx b/src/OBJECT/SMESH_ActorUtils.cxx
index e498c2f722bd26300b24d1c3c5d5976873b23417..cee51d0fb185c50ff9ead5d33e7fe6a009dbb101 100644 (file)
--- 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 57cfea7579766e7bb92d977fb9198d597b7fc99f..1495c9636915ca6db4cbc318b625370d64e97bf6 100644 (file)
--- 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<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;
 }

diff --git a/src/SMESHFiltersSelection/SMESH_LogicalFilter.hxx b/src/SMESHFiltersSelection/SMESH_LogicalFilter.hxx
index a6197ab82491768579fcd683dc886087f20a5ac0..5aabbbba38f17c4741c18a31105a9bdafb37cec6 100644 (file)
--- 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 <SUIT_SelectionFilter.h>
 
-#include <qptrlist.h>
+#include <QList>
 
 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<SUIT_SelectionFilter>&,
-                       const int);
+  SMESH_LogicalFilter( const QList<SUIT_SelectionFilter*>&, const int );
   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;
+  QList<SUIT_SelectionFilter*>  myFilters;
+  int                           myOperation;
 };
 
 #endif

diff --git a/src/SMESHFiltersSelection/SMESH_NumberFilter.cxx b/src/SMESHFiltersSelection/SMESH_NumberFilter.cxx
index 36a091c72fed8ed09115a8e9446bc71047085a49..6862c7004797edeae6cf6622105a653d8466f76e 100644 (file)
--- 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 3770b4a850869264c122cd7c3d6a011c75a65618..a19eb93fc7e5f83ae1d9dc94ab2bd37c851daab4 100644 (file)
--- 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;