From 7b613d2b8b0677db796f7ed6ec1abbec51896937 Mon Sep 17 00:00:00 2001 From: vsr Date: Fri, 21 Mar 2008 09:35:03 +0000 Subject: [PATCH] *** empty log message *** --- src/SMESHGUI/SMESHGUI_ComputeDlg.cxx | 6 +++--- src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx | 4 ++-- src/SMESHGUI/SMESHGUI_MeshOp.cxx | 2 +- src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx | 4 ++-- src/SMESHGUI/SMESHGUI_VTKUtils.cxx | 2 +- src/StdMeshersGUI/StdMeshersGUI_DistrPreview.cxx | 2 +- src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx b/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx index 195295c12..156e6f3b7 100644 --- a/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx @@ -182,7 +182,7 @@ namespace SMESH // ----------------------------------------------------------------------- bool HasReadyActorsFor (int subShapeID, GEOM::GEOM_Object_var aMainShape ) { - string mainEntry; + std::string mainEntry; if ( !aMainShape->_is_nil() ) mainEntry = aMainShape->GetStudyEntry(); return ( myMainEntry == mainEntry && @@ -192,7 +192,7 @@ namespace SMESH void Show( int subShapeID, GEOM::GEOM_Object_var aMainShape, bool only = false) { SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( SMESHGUI::GetSMESHGUI() ); - string mainEntry; + std::string mainEntry; if ( !aMainShape->_is_nil() ) mainEntry = aMainShape->GetStudyEntry(); if ( myMainEntry != mainEntry || aViewWindow != myViewWindow ) { // remove actors @@ -243,7 +243,7 @@ namespace SMESH TActorVec myActors; TActorVec myShownActors; TopTools_IndexedMapOfShape myIndexToShape; - string myMainEntry; + std::string myMainEntry; SVTK_ViewWindow* myViewWindow; vtkProperty* myProperty; std::set myBuiltSubs; diff --git a/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx b/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx index 14a12754e..af86ea9cb 100644 --- a/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx +++ b/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx @@ -239,7 +239,7 @@ namespace SMESH // Init list of available hypotheses, if needed InitAvailableHypotheses(); - list::iterator hypoSet = myListOfHypothesesSets.begin(); + std::list::iterator hypoSet = myListOfHypothesesSets.begin(); for ( ; hypoSet != myListOfHypothesesSets.end(); ++hypoSet ) { HypothesesSet* aSet = *hypoSet; @@ -253,7 +253,7 @@ namespace SMESH HypothesesSet* GetHypothesesSet(const QString& theSetName) { - list::iterator hypoSet = myListOfHypothesesSets.begin(); + std::list::iterator hypoSet = myListOfHypothesesSets.begin(); for ( ; hypoSet != myListOfHypothesesSets.end(); ++hypoSet ) { HypothesesSet* aSet = *hypoSet; diff --git a/src/SMESHGUI/SMESHGUI_MeshOp.cxx b/src/SMESHGUI/SMESHGUI_MeshOp.cxx index 909fbdd57..14fed46e8 100644 --- a/src/SMESHGUI/SMESHGUI_MeshOp.cxx +++ b/src/SMESHGUI/SMESHGUI_MeshOp.cxx @@ -321,7 +321,7 @@ bool SMESHGUI_MeshOp::isSubshapeOk() const while(1) { if (mainObj->_is_nil()) return false; - if (string(mainObj->GetEntry()) == string(mainGeom->GetEntry())) + if (std::string(mainObj->GetEntry()) == std::string(mainGeom->GetEntry())) return true; mainObj = op->GetMainShape(mainObj); } diff --git a/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx b/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx index ba45e5735..2f87dfd75 100644 --- a/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx @@ -239,13 +239,13 @@ void SMESHGUI_ShapeByMeshOp::SetMesh (SMESH::SMESH_Mesh_ptr thePtr) myGeomObj = GEOM::GEOM_Object::_nil(); myHasSolids = false; - vector< bool > hasElement (myDlg->myElemTypeGroup->buttons().count(), false); + std::vector< bool > hasElement (myDlg->myElemTypeGroup->buttons().count(), false); if (!myMesh->_is_nil() ) { // _PTR(SObject) aSobj = SMESH::FindSObject(myMesh.in()); // SUIT_DataOwnerPtr anIObj (new LightApp_DataOwner(aSobj->GetID().c_str())); - vector< int > nbShapes( TopAbs_SHAPE, 0 ); + std::vector< int > nbShapes( TopAbs_SHAPE, 0 ); int shapeDim = 0; // max dim with several shapes //if ( /*mySelectionMgr*/ selectionMgr()->isOk(anIObj) ) // check that the mesh has a valid shape { diff --git a/src/SMESHGUI/SMESHGUI_VTKUtils.cxx b/src/SMESHGUI/SMESHGUI_VTKUtils.cxx index 1a3f71f69..3cfbaf354 100644 --- a/src/SMESHGUI/SMESHGUI_VTKUtils.cxx +++ b/src/SMESHGUI/SMESHGUI_VTKUtils.cxx @@ -1041,7 +1041,7 @@ namespace SMESH if(FindActorByEntry(theIO->getEntry())){ TColStd_IndexedMapOfInteger aMapIndex; theMgr->GetIndexes(theIO,aMapIndex); - typedef set TIdContainer; + typedef std::set TIdContainer; TIdContainer anIdContainer; for( int i = 1; i <= aMapIndex.Extent(); i++) anIdContainer.insert(aMapIndex(i)); diff --git a/src/StdMeshersGUI/StdMeshersGUI_DistrPreview.cxx b/src/StdMeshersGUI/StdMeshersGUI_DistrPreview.cxx index 96a72747e..66e167a4f 100644 --- a/src/StdMeshersGUI/StdMeshersGUI_DistrPreview.cxx +++ b/src/StdMeshersGUI/StdMeshersGUI_DistrPreview.cxx @@ -252,7 +252,7 @@ void StdMeshersGUI_DistrPreview::update() } setAxisScale( myDensity->xAxis(), min_x, max_x ); - setAxisScale( myDensity->yAxis(), min( 0.0, min_y ), max( 0.0, max_y ) ); + setAxisScale( myDensity->yAxis(), std::min( 0.0, min_y ), std::max( 0.0, max_y ) ); myDensity->setData( x, y, size ); if( x ) delete[] x; diff --git a/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx b/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx index fdcede76b..038339739 100644 --- a/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx +++ b/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx @@ -190,7 +190,7 @@ void StdMeshersGUI_ObjectReferenceParamWdg::SetObject(CORBA::Object_ptr obj) if ( !CORBA::is_nil( obj )) sobj = SMESH::FindSObject (obj); if ( sobj ) { - string name = sobj->GetName(); + std::string name = sobj->GetName(); myObjNameLineEdit->setText( name.c_str() ); myObject = CORBA::Object::_duplicate( obj ); myParamValue = sobj->GetID().c_str();