merge fcts

GUI/View/Import/RealDataMaskWidget.cpp

@@ -137,8 +137,7 @@ void RealDataMaskWidget::setContextMW()
 
     m_editorCanvas->setContextMEC(currentData2DItem(), m_editorPropertyPanel->selectionModel());
 
-    m_editorActions->setModel(containerModel);
-    m_editorActions->setSelectionModel(m_editorPropertyPanel->selectionModel());
+    m_editorActions->setModels(containerModel, m_editorPropertyPanel->selectionModel());
 
     update();
 }

GUI/View/Mask/MaskEditorActions.cpp

@@ -68,14 +68,11 @@ MaskEditorActions::MaskEditorActions(QWidget* parent)
             &MaskEditorActions::propertyPanelRequest);
 }
 
-void MaskEditorActions::setModel(MaskContainerModel* maskContainerModel)
+void MaskEditorActions::setModels(MaskContainerModel* maskContainerModel,
+				  QItemSelectionModel* selectionModel)
 {
     ASSERT(maskContainerModel);
     m_maskContainerModel = maskContainerModel;
-}
-
-void MaskEditorActions::setSelectionModel(QItemSelectionModel* selectionModel)
-{
     m_selectionModel = selectionModel;
 }
 

GUI/View/Mask/MaskEditorActions.h

@@ -35,8 +35,7 @@ class MaskEditorActions : public QObject {
 public:
     MaskEditorActions(QWidget* parent);
 
-    void setModel(MaskContainerModel* maskContainerModel);
-    void setSelectionModel(QItemSelectionModel* selectionModel);
+    void setModels(MaskContainerModel* maskContainerModel, QItemSelectionModel* selectionModel);
 
     QAction* sendToBackAction();
     QAction* bringToFrontAction();