Join modifications from branch OCC_development_for_3_2_0a2

[modules/smesh.git] / src / SMESH_I / SMESH_Group_i.hxx

diff --git a/src/SMESH_I/SMESH_Group_i.hxx b/src/SMESH_I/SMESH_Group_i.hxx
index 48fb1c036f5627e1b6e51e8a7484636157c65656..cc7dabe729312cb0bc77d550221853666f58bb9c 100644 (file)
--- a/src/SMESH_I/SMESH_Group_i.hxx
+++ b/src/SMESH_I/SMESH_Group_i.hxx
@@ -37,7 +37,7 @@
 #include "SALOME_GenericObj_i.hh"
 
 class SMESH_Mesh_i;
-class ::SMESH_Group;
+class SMESH_Group;
 class SMESHDS_GroupBase;
 
 // ===========
@@ -70,9 +70,12 @@ class SMESH_GroupBase_i:
   // Internal C++ interface
   int GetLocalID() const { return myLocalID; }
   SMESH_Mesh_i* GetMeshServant() const { return myMeshServant; }
-  ::SMESH_Group* GetSmeshGroup() const;
+  SMESH_Group* GetSmeshGroup() const;
   SMESHDS_GroupBase* GetGroupDS() const;
 
+   void SetColorNumber(CORBA::Long color);
+   CORBA::Long GetColorNumber();
+
 private:
   SMESH_Mesh_i* myMeshServant;
   int myLocalID;
@@ -93,6 +96,9 @@ class SMESH_Group_i:
   void Clear();
   CORBA::Long Add( const SMESH::long_array& theIDs );
   CORBA::Long Remove( const SMESH::long_array& theIDs );
+
+  CORBA::Long AddByPredicate( SMESH::Predicate_ptr thePredicate );
+  CORBA::Long RemoveByPredicate( SMESH::Predicate_ptr thePredicate );
 };
 
 // =========================