Merge branch 'master' of newgeom:newgeom

Conflicts:
	src/PartSet/PartSet_OperationFeatureEditMulti.cpp

diff --cc src/ModuleBase/ModuleBase_Operation.cpp
Simple merge

diff --cc src/ModuleBase/ModuleBase_ResultPrs.cpp
Simple merge

diff --cc src/ModuleBase/ModuleBase_WidgetFactory.cpp
Simple merge

diff --cc src/PartSet/PartSet_OperationFeatureEditMulti.cpp
index 7ae6d08d998721920679ef0f9673ed4be437259c,7be21c613875411547a41c30fd7bcded3f536c6f..d1ee29448d7b9e1d4a44a660c9a15830691faefc
--- 1/src/PartSet/PartSet_OperationFeatureEditMulti.cpp
--- 2/src/PartSet/PartSet_OperationFeatureEditMulti.cpp
+++ b/src/PartSet/PartSet_OperationFeatureEditMulti.cpp
@@@ -80,16 -79,16 +79,15 @@@ void PartSet_OperationFeatureEditMulti:
    //} else
    myFeatures = theSelected;
    // add highlighted elements if they are not selected
 -  std::list<ModuleBase_ViewerPrs>::const_iterator anIt = theHighlighted.cbegin();
 -  for ( ; anIt != theHighlighted.cend(); ++anIt) {
 -    if (!isContains(myFeatures, (*anIt)))
 -      myFeatures.push_back(*anIt);
 +  foreach (ModuleBase_ViewerPrs aPrs, theHighlighted) {
 +    if (!isContains(myFeatures, aPrs))
 +      myFeatures.append(aPrs);
    }
    // Remove current feature if it is in the list (it will be moved as main feature)
-   FeaturePtr aFea = feature();
 -  std::list<ModuleBase_ViewerPrs>::iterator anEraseIt = myFeatures.begin();
 -  for ( ; anEraseIt != myFeatures.end(); ++anEraseIt) {
 -    if (ModelAPI_Feature::feature((*anEraseIt).object()) == feature()) {
 -      myFeatures.erase(anEraseIt);
 +  foreach (ModuleBase_ViewerPrs aPrs, myFeatures) {
 +    FeaturePtr aF = ModelAPI_Feature::feature(aPrs.object());
 +    if (ModelAPI_Feature::feature(aPrs.object()) == feature()) {
 +      myFeatures.removeOne(aPrs);
        break;
      }
    }

diff --cc src/PartSet/PartSet_OperationFeatureEditMulti.h
index 3454bdd5b61e04411b89e5d167f10bb280042be3,1008f3deb34b39173b6bb64b1da76675fe8ae9ea..e0fe5da1cb80c6a519c1b645ba976fbbb116cfe5
--- 1/src/PartSet/PartSet_OperationFeatureEditMulti.h
--- 2/src/PartSet/PartSet_OperationFeatureEditMulti.h
+++ b/src/PartSet/PartSet_OperationFeatureEditMulti.h
@@@ -9,8 -9,9 +9,10 @@@
  
  #include <PartSet_OperationSketchBase.h>
  #include <QObject>
 +#include <QList>
  
+ #include <list>
+ 
  class QMouseEvent;
  
  /*!