From: nds <nds@opencascade.com>
Date: Fri, 29 Jul 2016 12:39:55 +0000 (+0300)
Subject: Issue #1664: In the Sketcher, add the function Split a segment: linux compilation... 
X-Git-Tag: V_2.5.0~155
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=582ae80a3bf8276b72840506aef0818d87662551;p=modules%2Fshaper.git

Issue #1664: In the Sketcher, add the function Split a segment: linux compilation correction
---

diff --git a/src/SketchPlugin/SketchPlugin_ConstraintSplit.cpp b/src/SketchPlugin/SketchPlugin_ConstraintSplit.cpp
index 62b538554..0fa086dff 100755
--- a/src/SketchPlugin/SketchPlugin_ConstraintSplit.cpp
+++ b/src/SketchPlugin/SketchPlugin_ConstraintSplit.cpp
@@ -461,14 +461,14 @@ void SketchPlugin_ConstraintSplit::splitArc(FeaturePtr& theSplitFeature,
                                        (theSplitFeature->attribute(SketchPlugin_Arc::START_ID())));
 
   // additional constraints between split and base features
-  createConstraint(SketchPlugin_ConstraintEqual::ID(), getFeatureResult(aBaseFeature),
+  createConstraintForObjects(SketchPlugin_ConstraintEqual::ID(), getFeatureResult(aBaseFeature),
                                                        getFeatureResult(theSplitFeature));
-  createConstraint(SketchPlugin_ConstraintTangent::ID(), getFeatureResult(theSplitFeature),
+  createConstraintForObjects(SketchPlugin_ConstraintTangent::ID(), getFeatureResult(theSplitFeature),
                                                          getFeatureResult(aBaseFeature));
   if (theAfterFeature.get()) {
-    createConstraint(SketchPlugin_ConstraintEqual::ID(), getFeatureResult(aBaseFeature),
+    createConstraintForObjects(SketchPlugin_ConstraintEqual::ID(), getFeatureResult(aBaseFeature),
                                                          getFeatureResult(theAfterFeature));
-    createConstraint(SketchPlugin_ConstraintTangent::ID(), getFeatureResult(theSplitFeature),
+    createConstraintForObjects(SketchPlugin_ConstraintTangent::ID(), getFeatureResult(theSplitFeature),
                                                          getFeatureResult(theAfterFeature));
   }
 }
@@ -539,7 +539,7 @@ void SketchPlugin_ConstraintSplit::createConstraint(const std::string& theConstr
   aRefAttr->setAttr(theSecondAttribute);
 }
 
-void SketchPlugin_ConstraintSplit::createConstraint(const std::string& theConstraintId,
+void SketchPlugin_ConstraintSplit::createConstraintForObjects(const std::string& theConstraintId,
                                                     const ObjectPtr& theFirstObject,
                                                     const ObjectPtr& theSecondObject)
 {
diff --git a/src/SketchPlugin/SketchPlugin_ConstraintSplit.h b/src/SketchPlugin/SketchPlugin_ConstraintSplit.h
index e4f456514..2167a71c3 100755
--- a/src/SketchPlugin/SketchPlugin_ConstraintSplit.h
+++ b/src/SketchPlugin/SketchPlugin_ConstraintSplit.h
@@ -170,7 +170,7 @@ private:
   /// \param theConstraintId a constraint index
   /// \param theFirstAttribute an attribute of further coincidence
   /// \param theFirstAttribute an attribute of further coincidence
-  void createConstraint(const std::string& theConstraintId,
+  void createConstraintForObjects(const std::string& theConstraintId,
                         const std::shared_ptr<ModelAPI_Object>& theFirstObject,
                         const std::shared_ptr<ModelAPI_Object>& theSecondObject);