From: eap Date: Tue, 25 Jun 2013 11:56:49 +0000 (+0000) Subject: CoTech decision: move MEDWrapper from MED to SMESH X-Git-Tag: V7_3_0a1~317 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=15006895772bd79abdcbee0cd22d8bb80a21e1c4;p=modules%2Fsmesh.git CoTech decision: move MEDWrapper from MED to SMESH MED.idl no more exists SALOME_MED::MedFileInfo -> SMESH::MedFileInfo --- diff --git a/src/SMESHGUI/SMESHGUI_FileInfoDlg.cxx b/src/SMESHGUI/SMESHGUI_FileInfoDlg.cxx index 881cf5970..498a72dad 100644 --- a/src/SMESHGUI/SMESHGUI_FileInfoDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_FileInfoDlg.cxx @@ -29,7 +29,7 @@ #include #include -SMESHGUI_FileInfoDlg::SMESHGUI_FileInfoDlg( QWidget* parent, SALOME_MED::MedFileInfo* inf ) +SMESHGUI_FileInfoDlg::SMESHGUI_FileInfoDlg( QWidget* parent, SMESH::MedFileInfo* inf ) : QtxDialog( parent, true, true, QtxDialog::OK ) { setWindowTitle( tr( "CAPTION" ) ); diff --git a/src/SMESHGUI/SMESHGUI_FileInfoDlg.h b/src/SMESHGUI/SMESHGUI_FileInfoDlg.h index a1264d9a2..2cab5a95b 100644 --- a/src/SMESHGUI/SMESHGUI_FileInfoDlg.h +++ b/src/SMESHGUI/SMESHGUI_FileInfoDlg.h @@ -27,14 +27,14 @@ #include #include -#include CORBA_CLIENT_HEADER(MED) +#include CORBA_CLIENT_HEADER(SMESH_Mesh) class SMESHGUI_FileInfoDlg : public QtxDialog { Q_OBJECT public: - SMESHGUI_FileInfoDlg( QWidget*, SALOME_MED::MedFileInfo* ); + SMESHGUI_FileInfoDlg( QWidget*, SMESH::MedFileInfo* ); virtual ~SMESHGUI_FileInfoDlg(); }; diff --git a/src/SMESHGUI/SMESHGUI_MeshInfo.cxx b/src/SMESHGUI/SMESHGUI_MeshInfo.cxx index 4d7a1c38f..574fd58a9 100644 --- a/src/SMESHGUI/SMESHGUI_MeshInfo.cxx +++ b/src/SMESHGUI/SMESHGUI_MeshInfo.cxx @@ -2244,7 +2244,7 @@ void SMESHGUI_AddInfo::meshInfo( SMESH::SMESH_Mesh_ptr mesh, QTreeWidgetItem* pa { // type GEOM::GEOM_Object_var shape = mesh->GetShapeToMesh(); - SALOME_MED::MedFileInfo* inf = mesh->GetMEDFileInfo(); + SMESH::MedFileInfo* inf = mesh->GetMEDFileInfo(); QTreeWidgetItem* typeItem = createItem( parent, Bold ); typeItem->setText( 0, tr( "TYPE" ) ); if ( !CORBA::is_nil( shape ) ) { diff --git a/src/SMESHGUI/SMESHGUI_Selection.cxx b/src/SMESHGUI/SMESHGUI_Selection.cxx index 8c7ebc2c2..4b8c433f9 100644 --- a/src/SMESHGUI/SMESHGUI_Selection.cxx +++ b/src/SMESHGUI/SMESHGUI_Selection.cxx @@ -653,7 +653,7 @@ bool SMESHGUI_Selection::isImported( const int ind ) const SMESH::SMESH_Mesh_var aMesh = SMESH::SMESH_Mesh::_narrow( SMESH::SObjectToObject( SO ) ); if( !aMesh->_is_nil() ) { - SALOME_MED::MedFileInfo_var inf = aMesh->GetMEDFileInfo(); + SMESH::MedFileInfo_var inf = aMesh->GetMEDFileInfo(); res = strlen( (char*)inf->fileName ) > 0; } }