Merge branch 'BR_H2018_2' of https://codev-tuleap.cea.fr/plugins/git/salome/hydro...

[modules/hydro.git] / src / HYDROData / HYDROData_PriorityQueue.h

diff --git a/src/HYDROData/HYDROData_PriorityQueue.h b/src/HYDROData/HYDROData_PriorityQueue.h
index b9f645828794209fe84c5369e0747eb4100f451f..ef5660ab06fa14251c2de59649e44317aab1add4 100644 (file)
--- a/src/HYDROData/HYDROData_PriorityQueue.h
+++ b/src/HYDROData/HYDROData_PriorityQueue.h
@@ -48,7 +48,7 @@ public:
                            Standard_Integer aTag );
   ~HYDROData_PriorityQueue();
 
-  Handle_HYDROData_Entity GetMostPriorityObject( const QStringList& theZoneObjects,
+  Handle(HYDROData_Entity) GetMostPriorityObject( const QStringList& theZoneObjects,
                                                  HYDROData_Zone::MergeType& theMergeType ) const;
 
   bool IsMorePriority( const Handle(HYDROData_Entity)& theObj1,
@@ -75,9 +75,9 @@ public:
 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