X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_Selection.cpp;h=7a80eb0a9c8bcf3b5017ac250aa91fe19333591d;hb=4de8d53fef7532b6843d79c970f55ad46f98da62;hp=acfa828b2aabe717fa8ca1203070dda7781af181;hpb=f14192492e36f4febc93b2ad7ab7f866cbbdf71b;p=modules%2Fshaper.git diff --git a/src/XGUI/XGUI_Selection.cpp b/src/XGUI/XGUI_Selection.cpp index acfa828b2..7a80eb0a9 100644 --- a/src/XGUI/XGUI_Selection.cpp +++ b/src/XGUI/XGUI_Selection.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2019 CEA/DEN, EDF R&D +// Copyright (C) 2014-2024 CEA, EDF // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -56,6 +56,10 @@ #include +#ifdef WIN32 +#pragma warning(disable : 4456) // for nested foreach +#endif + #define DEBUG_DELIVERY XGUI_Selection::XGUI_Selection(XGUI_Workshop* theWorkshop) @@ -358,7 +362,6 @@ QList XGUI_Selection::getHighlighted() const return aPresentations; QList aSelectedIds; // Remember of selected address in order to avoid duplicates - XGUI_Displayer* aDisplayer = myWorkshop->displayer(); for (aContext->InitDetected(); aContext->MoreDetected(); aContext->NextDetected()) { Handle(SelectMgr_EntityOwner) anOwner = aContext->DetectedOwner(); if (!anOwner.IsNull()) { @@ -447,13 +450,12 @@ void XGUI_Selection::entityOwners(const Handle(AIS_InteractiveObject)& theObject Handle(SelectMgr_Selection) aSelection = theObject->Selection(aMode); NCollection_Vector anEntities = aSelection->Entities(); - for (NCollection_Vector::Iterator anIt(anEntities); - anIt.More(); - anIt.Next()) { - Handle(SelectMgr_SensitiveEntity) anEntity = anIt.Value(); + for (NCollection_Vector::Iterator anEntIt(anEntities); + anEntIt.More(); anEntIt.Next()) { + Handle(SelectMgr_SensitiveEntity) anEntity = anEntIt.Value(); if (anEntity.IsNull()) continue; - Handle(SelectMgr_EntityOwner) anOwner = anEntity->BaseSensitive()->OwnerId(); + Handle(SelectMgr_EntityOwner) anOwner = anEntity->BaseSensitive()->OwnerId(); if (!anOwner.IsNull()) theOwners.Add(anOwner); }