Merge branch 'V9_5_BR'

[modules/shaper.git] / src / FeaturesAPI / FeaturesAPI_BooleanFuse.h

diff --git a/src/FeaturesAPI/FeaturesAPI_BooleanFuse.h b/src/FeaturesAPI/FeaturesAPI_BooleanFuse.h
index 5f44f8aa9fec4bbd9f4f15d068583d965f6b072c..173b0b904f7d2809fbcd46c1350ee99c840f88c5 100644 (file)
--- a/src/FeaturesAPI/FeaturesAPI_BooleanFuse.h
+++ b/src/FeaturesAPI/FeaturesAPI_BooleanFuse.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2019  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2020  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -44,16 +44,14 @@ public:
   FEATURESAPI_EXPORT
   FeaturesAPI_BooleanFuse(const std::shared_ptr<ModelAPI_Feature>& theFeature,
                           const std::list<ModelHighAPI_Selection>& theMainObjects,
-                          const bool theRemoveEdges = false,
-                          const int theVersion = 0);
+                          const bool theRemoveEdges = false);
 
   /// Constructor with values.
   FEATURESAPI_EXPORT
   FeaturesAPI_BooleanFuse(const std::shared_ptr<ModelAPI_Feature>& theFeature,
                           const std::list<ModelHighAPI_Selection>& theMainObjects,
                           const std::list<ModelHighAPI_Selection>& theToolObjects,
-                          const bool theRemoveEdges = false,
-                          const int theVersion = 0);
+                          const bool theRemoveEdges = false);
 
   /// Destructor.
   FEATURESAPI_EXPORT
@@ -93,21 +91,16 @@ public:
 /// Pointer on Boolean object.
 typedef std::shared_ptr<FeaturesAPI_BooleanFuse> BooleanFusePtr;
 
-/// \ingroup CPPHighAPI
-/// \brief Create Boolean Fuse feature.
-FEATURESAPI_EXPORT
-BooleanFusePtr addFuse(const std::shared_ptr<ModelAPI_Document>& thePart,
-                       const std::list<ModelHighAPI_Selection>& theObjects,
-                       const bool theRemoveEdges = false,
-                       const int theVersion = 0);
+#define DUMMY_TOOLS std::pair<std::list<ModelHighAPI_Selection>, bool>\
+                    (std::list<ModelHighAPI_Selection>(), false)
 
 /// \ingroup CPPHighAPI
 /// \brief Create Boolean Fuse feature.
-FEATURESAPI_EXPORT
-BooleanFusePtr addFuse(const std::shared_ptr<ModelAPI_Document>& thePart,
-                       const std::list<ModelHighAPI_Selection>& theMainObjects,
-                       const std::list<ModelHighAPI_Selection>& theToolObjects,
-                       const bool theRemoveEdges = false,
-                       const int theVersion = 0);
+FEATURESAPI_EXPORT BooleanFusePtr addFuse(
+    const std::shared_ptr<ModelAPI_Document>& part,
+    const std::list<ModelHighAPI_Selection>& objects,
+    const std::pair<std::list<ModelHighAPI_Selection>, bool>& tools = DUMMY_TOOLS,
+    const bool removeEdges = false,
+    const bool keepSubResults = false);
 
 #endif // FeaturesAPI_BooleanFuse_H_