X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_PriorityQueue.h;h=7983a1f783a0407a487d6f317dde205fbd5f92ab;hb=d398a8be8e0b0259b476b358d53d234ce4c82379;hp=80d1b652a134b1550d6dcdabc46dc49f5207d883;hpb=f9bd5128a1aed8c1974b1d1cfb87aff32191fa60;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_PriorityQueue.h b/src/HYDROData/HYDROData_PriorityQueue.h
index 80d1b652..7983a1f7 100644
--- a/src/HYDROData/HYDROData_PriorityQueue.h
+++ b/src/HYDROData/HYDROData_PriorityQueue.h
@@ -33,10 +33,10 @@ enum HYDROData_PriorityType
 
 struct HYDROData_CustomRule
 {
-  Handle(HYDROData_Entity)           Object1;
-  HYDROData_PriorityType             Priority;
-  Handle(HYDROData_Entity)           Object2;
-  HYDROData_Zone::MergeAltitudesType MergeType;
+  Handle(HYDROData_Entity)  Object1;
+  HYDROData_PriorityType    Priority;
+  Handle(HYDROData_Entity)  Object2;
+  HYDROData_Zone::MergeType MergeType;
 };
 
 typedef QList<HYDROData_CustomRule> HYDROData_ListOfRules;
@@ -49,18 +49,18 @@ public:
   ~HYDROData_PriorityQueue();
 
   Handle_HYDROData_Entity GetMostPriorityObject( const QStringList& theZoneObjects,
-                                                 HYDROData_Zone::MergeAltitudesType& theMergeType ) const;
+                                                 HYDROData_Zone::MergeType& theMergeType ) const;
 
   bool IsMorePriority( const Handle(HYDROData_Entity)& theObj1,
                        const Handle(HYDROData_Entity)& theObj2,
-                       HYDROData_Zone::MergeAltitudesType& theMergeType ) const;
+                       HYDROData_Zone::MergeType& theMergeType ) const;
 
   static void ClearRules( TDF_Label& theRulesLabel );
   static void AddRule( TDF_Label& theRulesLabel,
                        const Handle(HYDROData_Entity)&    theObject1,
                        HYDROData_PriorityType             thePriority,
                        const Handle(HYDROData_Entity)&    theObject2,
-                       HYDROData_Zone::MergeAltitudesType theMergeType );
+                       HYDROData_Zone::MergeType theMergeType );
   static HYDROData_ListOfRules GetRules( const TDF_Label& theRulesLabel );
   static QString DumpRules( const TDF_Label& theRulesLab );
   static void DumpRulesToPython( const TDF_Label& theRulesLab,
@@ -71,13 +71,13 @@ public:
                        Handle(HYDROData_Entity)&           theObject1,
                        HYDROData_PriorityType&             thePriority,
                        Handle(HYDROData_Entity)&           theObject2,
-                       HYDROData_Zone::MergeAltitudesType& theMergeType );
+                       HYDROData_Zone::MergeType& theMergeType );
 private:
   typedef QMap<QString, Handle(HYDROData_Entity)> MapNameToObject;
 
-  HYDROData_SequenceOfObjects myGeomObjects;  ///< the ordered list of objects (default priority)
-  MapNameToObject             myNames;        ///< the map of name to object
-  HYDROData_ListOfRules       myRules;        ///< the list of rules
+  HYDROData_SequenceOfObjects myObjects;  ///< the ordered list of objects (default priority)
+  MapNameToObject             myNames;    ///< the map of name to object
+  HYDROData_ListOfRules       myRules;    ///< the list of rules
 };
 
 #endif