Update for migration from 6.6 version to v7_main version

Francis Kloss

diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx b/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx
index d7eb83aabd127470577ec66726e14684bce4a9ab..32eea50a43698eb2922b44d2e5474e791bcdbb91 100755 (executable)
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx
@@ -142,7 +142,6 @@ SalomeApp_Application*  HEXABLOCKGUI::myApplication = NULL;
 
 HEXABLOCKGUI::HEXABLOCKGUI() :
           SalomeApp_Module( "HEXABLOCK" ),
-          LightApp_Module( "HEXABLOCK" ),
           _menuId(190),
           _dwPattern(0),
           _dwAssociation(0),

diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_VtkDocumentGraphicView.cxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_VtkDocumentGraphicView.cxx
index d795a380b8ce2f4597d8598ea91707d4d80b612b..07eb8f3051b975d190add126530a2511744ac3e9 100755 (executable)
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_VtkDocumentGraphicView.cxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_VtkDocumentGraphicView.cxx
@@ -111,7 +111,7 @@ Document_Actor::Document_Actor( Document* doc, const QString& entry ):
     setIO(anIO);
     vtkUnstructuredGrid* aGrid = getUnstructuredGrid();
     vtkDataSetMapper* aMapper = vtkDataSetMapper::New();
-    aMapper->SetInput(aGrid);
+    aMapper->SetInputData(aGrid);
     aGrid->Delete();
 
     SetVisibility( true );//VisibilityOff();
@@ -306,7 +306,7 @@ Associate_Actor::Associate_Actor( Document* doc, const QString& entry)
     vtkUnstructuredGrid* aGrid = getUnstructuredGrid();
 
     vtkDataSetMapper* aMapper = vtkDataSetMapper::New();
-    aMapper->SetInput(aGrid);
+    aMapper->SetInputData(aGrid);
     aGrid->Delete();
 
     SetVisibility( true );//VisibilityOff();
@@ -981,7 +981,7 @@ void VtkDocumentGraphicView::setModel ( QAbstractItemModel * model )
 //   // Create and display actor
 //
 //   vtkDataSetMapper* myMapper = vtkDataSetMapper::New();
-//   myMapper->SetInput(myGrid);
+//   myMapper->SetInputData(myGrid);
 //
 // //   if ( myPreviewActor ){
 // //     myVTKViewWindow->RemoveActor(myPreviewActor);