Merge branch 'Dev_0.6.1' of newgeom:newgeom into Dev_0.6.1

[modules/shaper.git] / src / FeaturesPlugin / FeaturesPlugin_Boolean.h

diff --git a/src/FeaturesPlugin/FeaturesPlugin_Boolean.h b/src/FeaturesPlugin/FeaturesPlugin_Boolean.h
index 0fdeb6baeee7901f36a0b3babea4c798687c32f2..824dcd0dbb5dd787032974c50c93f6c0b95dde69 100644 (file)
--- a/src/FeaturesPlugin/FeaturesPlugin_Boolean.h
+++ b/src/FeaturesPlugin/FeaturesPlugin_Boolean.h
@@ -1,3 +1,5 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
+
 // File:        FeaturesPlugin_Boolean.h
 // Created:     02 Sept 2014
 // Author:      Vitaly SMETANNIKOV
@@ -16,8 +18,8 @@ class FeaturesPlugin_Boolean : public ModelAPI_Feature
   /// Extrusion kind
   inline static const std::string& ID()
   {
-    static const std::string MY_CUT_ID("Boolean");
-    return MY_CUT_ID;
+    static const std::string MY_ID("Boolean");
+    return MY_ID;
   }
   /// attribute name of referenced object
   inline static const std::string& OBJECT_ID()
@@ -34,13 +36,13 @@ class FeaturesPlugin_Boolean : public ModelAPI_Feature
   /// attribute name of operation type
   inline static const std::string& TYPE_ID()
   {
-    static const std::string MY_TOOL_ID("bool_type");
-    return MY_TOOL_ID;
+    static const std::string MY_TYPE_ID("bool_type");
+    return MY_TYPE_ID;
   }
 
   enum {
-    BOOL_FUSE,
        BOOL_CUT,
+       BOOL_FUSE,
     BOOL_COMMON
   };
 
@@ -62,13 +64,13 @@ class FeaturesPlugin_Boolean : public ModelAPI_Feature
   FeaturesPlugin_Boolean();
 
 private:
-  boost::shared_ptr<GeomAPI_Shape> getShape(const std::string& theAttrName);
+  std::shared_ptr<GeomAPI_Shape> getShape(const std::string& theAttrName);
   
   /// Load Naming data structure of the feature to the document
   void LoadNamingDS(GeomAlgoAPI_Boolean* theFeature, 
-                                       boost::shared_ptr<ModelAPI_ResultBody> theResultBody,
-                       boost::shared_ptr<GeomAPI_Shape> theObject,
-                       boost::shared_ptr<GeomAPI_Shape> theTool,
+                                       std::shared_ptr<ModelAPI_ResultBody> theResultBody,
+                       std::shared_ptr<GeomAPI_Shape> theObject,
+                       std::shared_ptr<GeomAPI_Shape> theTool,
                                        int theType);
 };