From c0c2a91aeee454191e746b61e5262436d748a60f Mon Sep 17 00:00:00 2001
From: vsv <vitaly.smetannikov@opencascade.com>
Date: Mon, 29 Dec 2014 17:01:53 +0300
Subject: [PATCH] Obsolete keyword "use-subshapes" is removed

---
 src/ConstructionPlugin/axis_widget.xml            |  2 --
 src/ConstructionPlugin/plane_widget.xml           |  1 -
 src/FeaturesPlugin/extrusion_widget.xml           |  1 -
 src/FeaturesPlugin/placement_widget.xml           |  2 --
 src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp |  3 ---
 src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp |  2 --
 src/SketchPlugin/plugin-Sketch.xml                | 14 ++++++--------
 7 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/src/ConstructionPlugin/axis_widget.xml b/src/ConstructionPlugin/axis_widget.xml
index 8d4a40a8d..8bd931b3d 100644
--- a/src/ConstructionPlugin/axis_widget.xml
+++ b/src/ConstructionPlugin/axis_widget.xml
@@ -6,13 +6,11 @@
     icon=":icons/point.png" 
     tooltip="Select a first point"
     shape_types="vertex"
-	use_subshapes="true"
   />
   <shape_selector id="secondPoint"
     label="Second point"
     icon=":icons/point.png"
     tooltip="Select a second point"
     shape_types="vertex"
-	use_subshapes="true">
   </shape_selector>
 </source>
diff --git a/src/ConstructionPlugin/plane_widget.xml b/src/ConstructionPlugin/plane_widget.xml
index 546cc919b..73b29f012 100644
--- a/src/ConstructionPlugin/plane_widget.xml
+++ b/src/ConstructionPlugin/plane_widget.xml
@@ -5,7 +5,6 @@
                   label="Plane face" 
                   tooltip="Select a planar face"
                   shape_types="face"
-                  use_subshapes="true">
 		  <selection_filter id="FaceFilter" parameters="plane"/>
   </shape_selector>
   <doublevalue id="distance" 
diff --git a/src/FeaturesPlugin/extrusion_widget.xml b/src/FeaturesPlugin/extrusion_widget.xml
index 86dafe348..d37d8da99 100644
--- a/src/FeaturesPlugin/extrusion_widget.xml
+++ b/src/FeaturesPlugin/extrusion_widget.xml
@@ -8,7 +8,6 @@
     activate="true"
     shape_types="face"
 	object_types="construction"
-    use_subshapes="true"
   />
   <doublevalue
     id="extrusion_size"
diff --git a/src/FeaturesPlugin/placement_widget.xml b/src/FeaturesPlugin/placement_widget.xml
index 4f04fa9cd..fd4924fa0 100644
--- a/src/FeaturesPlugin/placement_widget.xml
+++ b/src/FeaturesPlugin/placement_widget.xml
@@ -6,14 +6,12 @@
     icon=":icons/cut_shape.png" 
     tooltip="Select a destination face"
     shape_types="face"
-    use_subshapes="true"
   />
   <shape_selector id="placement_attractable_face" 
 		label="Select a face" 
 		icon=":icons/cut_shape.png" 
 		tooltip="Select a face of moved object" 
 		shape_types="face" 
-		use_subshapes="true"	
 		concealment="true" >
 	<validator id="PartSet_DifferentObjects"/>
   </shape_selector>
diff --git a/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp b/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp
index 114a76748..f3d2807da 100644
--- a/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp
@@ -62,9 +62,6 @@ ModuleBase_WidgetMultiSelector::ModuleBase_WidgetMultiSelector(QWidget* theParen
   aMainLay->addWidget(new QLabel(myMainWidget));
   aMainLay->setRowMinimumHeight(3, 20);
   myMainWidget->setLayout(aMainLay);
-  //TODO: Move into the base class
-  myUseSubShapes = theData->getBooleanAttribute("use_subshapes", false);
-  //TODO_END
   connect(myTypeCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(onSelectionTypeChanged()));
 
   myCopyAction = new QAction(QIcon(":pictures/copy.png"), tr("Copy"), this);
diff --git a/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp b/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
index ba0f248af..bea20b3fc 100644
--- a/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
@@ -119,8 +119,6 @@ ModuleBase_WidgetShapeSelector::ModuleBase_WidgetShapeSelector(QWidget* theParen
 
   std::string aObjTypes = theData->getProperty("object_types");
   myObjectTypes = QString(aObjTypes.c_str()).split(' ', QString::SkipEmptyParts);
-
-  //myUseSubShapes = theData->getBooleanAttribute("use_subshapes", false); 
 }
 
 //********************************************************************
diff --git a/src/SketchPlugin/plugin-Sketch.xml b/src/SketchPlugin/plugin-Sketch.xml
index e52d615f0..e249eb240 100644
--- a/src/SketchPlugin/plugin-Sketch.xml
+++ b/src/SketchPlugin/plugin-Sketch.xml
@@ -49,13 +49,12 @@
           id="ConstraintEntityA" 
           label="First object" 
           tooltip="Select point, line end point, line, center of circle or arc."
-          shape_types="edge vertex"  
-          use_subshapes="true"/>
+          shape_types="edge vertex"/>
 		<sketch_shape_selector 
           id="ConstraintEntityB" 
           label="Last object" 
           tooltip="Select point, line end point, line, center of circle or arc." 
-			shape_types="edge vertex"  use_subshapes="true">
+			    shape_types="edge vertex">
 			<validator id="SketchPlugin_DifferentObjects"/>
 		</sketch_shape_selector>
 		
@@ -96,13 +95,12 @@
 	<!--  SketchConstraintParallel  -->
       <feature id="SketchConstraintParallel" title="Parallel" tooltip="Create constraint defining two parallel lines" icon=":icons/parallel.png">
 		<sketch_constraint_shape_selector id="ConstraintEntityA" 
-			label="First line" tooltip="Select a line" 
-			shape_types="edge" use_subshapes="true">
+			label="First line" tooltip="Select a line" shape_types="edge">
 			<selection_filter id="EdgeFilter" parameters="line"/>
 		</sketch_constraint_shape_selector>
 		
 		<sketch_constraint_shape_selector id="ConstraintEntityB" label="Last line" tooltip="Select a line" 
-			shape_types="edge" use_subshapes="true">
+			shape_types="edge">
 			<selection_filter id="EdgeFilter" parameters="line"/>
 			<validator id="SketchPlugin_DifferentObjects"/>
 		</sketch_constraint_shape_selector>
@@ -114,13 +112,13 @@
       <feature id="SketchConstraintPerpendicular" title="Perpendicular" tooltip="Create constraint defining two perpendicular lines" icon=":icons/perpendicular.png">
 		<sketch_constraint_shape_selector id="ConstraintEntityA" 
 			label="First line" tooltip="Select an line" 
-			shape_types="edge" use_subshapes="true">
+			shape_types="edge">
       <selection_filter id="EdgeFilter" parameters="line"/>
     </sketch_constraint_shape_selector>
 		
 		<sketch_constraint_shape_selector id="ConstraintEntityB" 
 			label="Last line" tooltip="Select an line" 
-			shape_types="edge" use_subshapes="true">
+			shape_types="edge">
 			<validator id="SketchPlugin_DifferentObjects"/>
       <selection_filter id="EdgeFilter" parameters="line"/>
     </sketch_constraint_shape_selector>
-- 
2.39.2