From b8c608207b3709026ab4c5ba1082ae205ea6ea50 Mon Sep 17 00:00:00 2001 From: vsr Date: Fri, 21 Mar 2008 08:09:07 +0000 Subject: [PATCH] *** empty log message *** --- src/SMESHGUI/SMESHGUI.cxx | 10 +++++----- src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx | 10 +++++----- src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx index bc7537e0a..cfbea4a4e 100644 --- a/src/SMESHGUI/SMESHGUI.cxx +++ b/src/SMESHGUI/SMESHGUI.cxx @@ -151,7 +151,7 @@ int theCommandID) { QStringList filter; - string myExtension; + std::string myExtension; if(theCommandID == 113){ filter.append(QObject::tr("MED files (*.med)")); @@ -889,9 +889,9 @@ // put the whole hierarchy of sub-objects of the selected SO into a list and // then treat them all starting from the deepest objects (at list back) - list< _PTR(SObject) > listSO; + std::list< _PTR(SObject) > listSO; listSO.push_back( aSO ); - list< _PTR(SObject) >::iterator itSO = listSO.begin(); + std::list< _PTR(SObject) >::iterator itSO = listSO.begin(); for ( ; itSO != listSO.end(); ++itSO ) { _PTR(ChildIterator) it = aStudy->NewChildIterator( *itSO ); for (it->InitEx(false); it->More(); it->Next()) @@ -900,11 +900,11 @@ // treat SO's in the list starting from the back - list< _PTR(SObject) >::reverse_iterator ritSO = listSO.rbegin(); + std::list< _PTR(SObject) >::reverse_iterator ritSO = listSO.rbegin(); for ( ; ritSO != listSO.rend(); ++ritSO ) { _PTR(SObject) SO = *ritSO; if ( !SO ) continue; - string anEntry = SO->GetID(); + std::string anEntry = SO->GetID(); /** Erase graphical object **/ if(SO->FindAttribute(anAttr, "AttributeIOR")){ diff --git a/src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx b/src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx index 1afa9aa05..4ce15cafb 100644 --- a/src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx @@ -108,7 +108,7 @@ namespace SMESH bool myIsPointsLabeled; vtkActor2D* myPointLabels; - vector myIDs; + std::vector myIDs; public: TIdPreview(SVTK_ViewWindow* theViewWindow): @@ -189,7 +189,7 @@ namespace SMESH } void SetElemsData( TColStd_MapOfInteger & theElemsIdMap, - list & aGrCentersXYZ ) + std::list & aGrCentersXYZ ) { vtkPoints* aPoints = vtkPoints::New(); aPoints->SetNumberOfPoints(theElemsIdMap.Extent()); @@ -201,7 +201,7 @@ namespace SMESH } gp_XYZ aXYZ; - list::iterator coordIt = aGrCentersXYZ.begin(); + std::list::iterator coordIt = aGrCentersXYZ.begin(); for( int i = 0; coordIt != aGrCentersXYZ.end(); coordIt++, i++ ) { aXYZ = *coordIt; aPoints->SetPoint( i, aXYZ.X(), aXYZ.Y(), aXYZ.Z() ); @@ -790,7 +790,7 @@ void SMESHGUI_EditMeshDlg::onSelectGroup() myIdPreview->SetPointsLabeled(!anIndices.IsEmpty(), myActor->GetVisibility()); } else { - list< gp_XYZ > aGrCentersXYZ; + std::list< gp_XYZ > aGrCentersXYZ; FindGravityCenter(anIndices, aGrCentersXYZ); myIdPreview->SetElemsData( anIndices, aGrCentersXYZ); myIdPreview->SetPointsLabeled(!anIndices.IsEmpty(), myActor->GetVisibility()); @@ -839,7 +839,7 @@ void SMESHGUI_EditMeshDlg::onSelectElementFromGroup() myIdPreview->SetPointsLabeled(!anIndices.IsEmpty(), myActor->GetVisibility()); } else { - list< gp_XYZ > aGrCentersXYZ; + std::list< gp_XYZ > aGrCentersXYZ; FindGravityCenter(anIndices, aGrCentersXYZ); myIdPreview->SetElemsData(anIndices, aGrCentersXYZ); myIdPreview->SetPointsLabeled(!anIndices.IsEmpty(), myActor->GetVisibility()); diff --git a/src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx b/src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx index 43e14a203..c6710d6cd 100755 --- a/src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx @@ -310,7 +310,7 @@ static bool findTriangles (const SMDS_MeshNode * theNode1, theTria1 = theTria2 = 0; - set< const SMDS_MeshElement* > emap; + std::set< const SMDS_MeshElement* > emap; SMDS_ElemIteratorPtr it = theNode1->GetInverseElementIterator(); while (it->more()) { const SMDS_MeshElement* elem = it->next(); -- 2.39.2