Replace ::smIdType by SMESH::smIdType

Fix compilation errors in SMESH_Filter_i.cxx on Debian-8
Fix warnings in SMEHS_MeshEditor_i.cxx

diff --git a/src/Controls/SMESH_ControlsDef.hxx b/src/Controls/SMESH_ControlsDef.hxx
index b633bb141019cb1cda21bc5cab35339defe5689d..c1fe797bc34753f048b7728e8f44389ebdc52069 100644 (file)
--- a/src/Controls/SMESH_ControlsDef.hxx
+++ b/src/Controls/SMESH_ControlsDef.hxx
@@ -133,12 +133,12 @@ namespace SMESH{
       virtual void SetMesh( const SMDS_Mesh* theMesh );
       virtual double GetValue( long theElementId );
       virtual double GetValue(const TSequenceOfXYZ& /*thePoints*/) { return -1.0;};
-      void GetHistogram(int                          nbIntervals,
-                        std::vector<int>&            nbEvents,
-                        std::vector<double>&         funValues,
+      void GetHistogram(int                            nbIntervals,
+                        std::vector<int>&              nbEvents,
+                        std::vector<double>&           funValues,
                         const std::vector<::smIdType>& elements,
-                        const double*                minmax=0,
-                        const bool                   isLogarithmic = false);
+                        const double*                  minmax=0,
+                        const bool                     isLogarithmic = false);
       bool IsApplicable( long theElementId ) const;
       virtual bool IsApplicable( const SMDS_MeshElement* element ) const;
       virtual SMDSAbs_ElementType GetType() const = 0;

diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx
index 3da424846d82aebe467e28eb853ea992fc874c2e..a68966e639b9b6d2674333eb1dd4b201e5fa031d 100644 (file)
--- a/src/SMESHGUI/SMESHGUI.cxx
+++ b/src/SMESHGUI/SMESHGUI.cxx
@@ -1226,7 +1226,7 @@ namespace
             SMESH::Controls::NumericalFunctor* aNumFun =
               dynamic_cast<SMESH::Controls::NumericalFunctor*>( aFunctor.get() );
             if ( aNumFun ) {
-              std::vector<::smIdType> elements;
+              std::vector<SMESH::smIdType> elements;
               SMESH::SMESH_Mesh_var mesh = SMESH::IObjectToInterface<SMESH::SMESH_Mesh>(anIO);
               if ( mesh->_is_nil() ) {
                 SMESH::SMESH_IDSource_var idSource =

diff --git a/src/SMESH_I/SMESH_Filter_i.cxx b/src/SMESH_I/SMESH_Filter_i.cxx
index 0de85b22d770871b07619718da501a3833171e3a..40b20acbb26dae4b524cd72e21ce844c49183693 100644 (file)
--- a/src/SMESH_I/SMESH_Filter_i.cxx
+++ b/src/SMESH_I/SMESH_Filter_i.cxx
@@ -4200,7 +4200,7 @@ namespace SMESH {
    */
   //================================================================================
 
-  const char* SMESH::FunctorTypeToString(SMESH::FunctorType ft)
+  const char* FunctorTypeToString(FunctorType ft)
   {
     if ( ft < 0 || ft > SMESH::FT_Undefined )
       return "FT_Undefined";
@@ -4213,7 +4213,7 @@ namespace SMESH {
    */
   //================================================================================
 
-  SMESH::FunctorType SMESH::StringToFunctorType(const char* str)
+  FunctorType StringToFunctorType(const char* str)
   {
     std::string name( str + 3 ); // skip "FT_"
     const char** functNames = getFunctNames();
@@ -4285,4 +4285,4 @@ namespace SMESH {
 
     return is;
   }
-}
\ No newline at end of file
+}

diff --git a/src/SMESH_I/SMESH_Group_i.cxx b/src/SMESH_I/SMESH_Group_i.cxx
index 28136f2b50c34032c6ae3ecad3ee7bdcf27388eb..357ae2aa3c09f614da573225cff35ca57b8496a6 100644 (file)
--- a/src/SMESH_I/SMESH_Group_i.cxx
+++ b/src/SMESH_I/SMESH_Group_i.cxx
@@ -362,10 +362,10 @@ SMESH::smIdType  SMESH_Group_i::Remove( const SMESH::smIdType_array& theIDs )
 typedef bool (SMESHDS_Group::*TFunChangeGroup)(const smIdType);
 
 CORBA::Long 
-ChangeByPredicate( SMESH::Predicate_i* thePredicate,
-                   SMESHDS_GroupBase*  theGroupBase,
-                   SMESH::NotifyerAndWaiter*  theGroupImpl,
-                   TFunChangeGroup     theFun)
+ChangeByPredicate( SMESH::Predicate_i*       thePredicate,
+                   SMESHDS_GroupBase*        theGroupBase,
+                   SMESH::NotifyerAndWaiter* theGroupImpl,
+                   TFunChangeGroup           theFun)
 {
   CORBA::Long aNb = 0;
   if(SMESHDS_Group* aGroupDS = dynamic_cast<SMESHDS_Group*>(theGroupBase)){

diff --git a/src/SMESH_I/SMESH_MeshEditor_i.cxx b/src/SMESH_I/SMESH_MeshEditor_i.cxx
index d96c5c99e22847b2bf173ea69fe6865630028480..bc5073500db6148ef201df650fef4b78575afc70 100644 (file)
--- a/src/SMESH_I/SMESH_MeshEditor_i.cxx
+++ b/src/SMESH_I/SMESH_MeshEditor_i.cxx
@@ -279,13 +279,13 @@ namespace MeshEditor_I {
     SMDS_MeshElement::Filter & filter = *aFilter;
 
     if ( aType == SMDSAbs_Node )
-      for ( SMESH::smIdType i = 0; i < IDs.length(); i++ ) {
+      for ( CORBA::ULong i = 0; i < IDs.length(); i++ ) {
         const SMDS_MeshElement * elem = aMesh->FindNode( IDs[i] );
         if ( filter( elem ))
           aMap.insert( aMap.end(), elem );
       }
     else
-      for ( SMESH::smIdType i = 0; i<IDs.length(); i++) {
+      for ( CORBA::ULong i = 0; i<IDs.length(); i++) {
         const SMDS_MeshElement * elem = aMesh->FindElement( IDs[i] );
         if ( filter( elem ))
           aMap.insert( aMap.end(), elem );
@@ -789,7 +789,7 @@ SMESH_MeshEditor_i::RemoveElements(const SMESH::smIdType_array & IDsOfElements)
 
   list< smIdType > IdList;
 
-  for ( SMESH::smIdType i = 0; i < IDsOfElements.length(); i++ )
+  for ( CORBA::ULong i = 0; i < IDsOfElements.length(); i++ )
     IdList.push_back( IDsOfElements[i] );
 
   // Update Python script
@@ -817,7 +817,7 @@ CORBA::Boolean SMESH_MeshEditor_i::RemoveNodes(const SMESH::smIdType_array & IDs
   initData();
 
   list< smIdType > IdList;
-  for ( SMESH::smIdType i = 0; i < IDsOfNodes.length(); i++)
+  for ( CORBA::ULong i = 0; i < IDsOfNodes.length(); i++)
     IdList.push_back( IDsOfNodes[i] );
 
   // Update Python script
@@ -1578,7 +1578,7 @@ CORBA::Boolean SMESH_MeshEditor_i::Reorient(const SMESH::smIdType_array & IDsOfE
   SMESH_TRY;
   initData();
 
-  for ( SMESH::smIdType i = 0; i < IDsOfElements.length(); i++ )
+  for ( CORBA::ULong i = 0; i < IDsOfElements.length(); i++ )
   {
     SMESH::smIdType index = IDsOfElements[i];
     const SMDS_MeshElement * elem = getMeshDS()->FindElement(index);
@@ -2252,7 +2252,7 @@ SMESH_MeshEditor_i::smooth(const SMESH::smIdType_array &          IDsOfElements,
   arrayToSet(IDsOfElements, aMesh, elements, SMDSAbs_Face);
 
   set<const SMDS_MeshNode*> fixedNodes;
-  for ( SMESH::smIdType i = 0; i < IDsOfFixedNodes.length(); i++) {
+  for ( CORBA::ULong i = 0; i < IDsOfFixedNodes.length(); i++) {
     SMESH::smIdType index = IDsOfFixedNodes[i];
     const SMDS_MeshNode * node = aMesh->FindNode(index);
     if ( node )
@@ -4342,7 +4342,7 @@ void SMESH_MeshEditor_i::MergeElements(const SMESH::array_of_long_array& theGrou
     if ( elemTypes->length() == 1 && elemTypes[0] == SMESH::NODE )
       continue;
     SMESH::smIdType_array_var elementsId = theElementsToKeep[i]->GetIDs();
-    for ( SMESH::smIdType j = 0; j < elementsId->length(); ++j )
+    for ( CORBA::ULong j = 0; j < elementsId->length(); ++j )
       idsToKeep.Add( elementsId[ j ]);
   }
 
@@ -4353,7 +4353,7 @@ void SMESH_MeshEditor_i::MergeElements(const SMESH::array_of_long_array& theGrou
     const SMESH::long_array& anElemsIDGroup = theGroupsOfElementsID[ i ];
     aListOfListOfElementsID.push_back( list< smIdType >() );
     list< smIdType >& aListOfElemsID = aListOfListOfElementsID.back();
-    for ( SMESH::smIdType j = 0; j < anElemsIDGroup.length(); j++ )
+    for ( CORBA::ULong j = 0; j < anElemsIDGroup.length(); j++ )
     {
       SMESH::smIdType id = anElemsIDGroup[ j ];
       if ( idsToKeep.Contains( id )) aListOfElemsID.push_front( id );