From e22c76a58f6262aa983119bd6c45eabfcdd470d4 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sun, 11 Jul 2021 23:52:38 -0400
Subject: [PATCH] Clean up getChildList loops
---
indra/llui/llcontainerview.cpp | 24 +++------
indra/llui/llfloater.cpp | 90 ++++++++++++++--------------------
indra/newview/llchiclet.cpp | 6 +--
3 files changed, 47 insertions(+), 73 deletions(-)
diff --git a/indra/llui/llcontainerview.cpp b/indra/llui/llcontainerview.cpp
index 727fbe850e2..cae6abbd44b 100644
--- a/indra/llui/llcontainerview.cpp
+++ b/indra/llui/llcontainerview.cpp
@@ -182,10 +182,8 @@ void LLContainerView::arrange(S32 width, S32 height, BOOL called_from_parent)
{
// Determine total height
U32 child_height = 0;
- for (child_list_const_iter_t child_iter = getChildList()->begin();
- child_iter != getChildList()->end(); ++child_iter)
- {
- LLView *childp = *child_iter;
+ for (LLView* childp : *getChildList())
+ {
if (!childp->getVisible())
{
LL_WARNS() << "Incorrect visibility!" << LL_ENDL;
@@ -224,10 +222,8 @@ void LLContainerView::arrange(S32 width, S32 height, BOOL called_from_parent)
if (mDisplayChildren)
{
// Iterate through all children, and put in container from top down.
- for (child_list_const_iter_t child_iter = getChildList()->begin();
- child_iter != getChildList()->end(); ++child_iter)
- {
- LLView *childp = *child_iter;
+ for (LLView* childp : *getChildList())
+ {
LLRect child_rect = childp->getRequiredRect();
bottom -= child_rect.getHeight();
LLRect r(left, bottom + child_rect.getHeight(), right, bottom);
@@ -268,10 +264,8 @@ LLRect LLContainerView::getRequiredRect()
{
// Determine total height
U32 child_height = 0;
- for (child_list_const_iter_t child_iter = getChildList()->begin();
- child_iter != getChildList()->end(); ++child_iter)
- {
- LLView *childp = *child_iter;
+ for (LLView* childp : *getChildList())
+ {
LLRect child_rect = childp->getRequiredRect();
child_height += child_rect.getHeight();
child_height += 2;
@@ -291,10 +285,8 @@ void LLContainerView::setLabel(const std::string& label)
void LLContainerView::setDisplayChildren(const BOOL displayChildren)
{
mDisplayChildren = displayChildren;
- for (child_list_const_iter_t child_iter = getChildList()->begin();
- child_iter != getChildList()->end(); ++child_iter)
- {
- LLView *childp = *child_iter;
+ for (LLView* childp : *getChildList())
+ {
childp->setVisible(mDisplayChildren);
}
}
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 6c743144282..0ff7c4b1aca 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -2362,9 +2362,8 @@ void LLFloaterView::reshape(S32 width, S32 height, BOOL called_from_parent)
mLastSnapRect = getSnapRect();
- for ( child_list_const_iter_t child_it = getChildList()->begin(); child_it != getChildList()->end(); ++child_it)
+ for (LLView* viewp : *getChildList())
{
- LLView* viewp = *child_it;
LLFloater* floaterp = dynamic_cast<LLFloater*>(viewp);
if (floaterp->isDependent())
{
@@ -2420,10 +2419,10 @@ void LLFloaterView::reshape(S32 width, S32 height, BOOL called_from_parent)
void LLFloaterView::restoreAll()
{
// make sure all subwindows aren't minimized
- child_list_t child_list = *(getChildList());
- for (child_list_const_iter_t child_it = child_list.begin(); child_it != child_list.end(); ++child_it)
+ child_list_t child_list = *(getChildList()); // Copy as list order can change during visibility
+ for (LLView* viewp : child_list)
{
- LLFloater* floaterp = dynamic_cast<LLFloater*>(*child_it);
+ LLFloater* floaterp = dynamic_cast<LLFloater*>(viewp);
if (floaterp)
{
floaterp->setMinimized(FALSE);
@@ -2526,9 +2525,9 @@ void LLFloaterView::bringToFront(LLFloater* child, BOOL give_focus, BOOL restore
}
std::vector<LLFloater*> floaters_to_move;
// Look at all floaters...tab
- for (child_list_const_iter_t child_it = beginChild(); child_it != endChild(); ++child_it)
+ for (LLView* childp : *getChildList())
{
- LLFloater* floater = dynamic_cast<LLFloater*>(*child_it);
+ LLFloater* floater = dynamic_cast<LLFloater*>(childp);
// ...but if I'm a dependent floater...
if (floater && child->isDependent())
@@ -2554,10 +2553,8 @@ void LLFloaterView::bringToFront(LLFloater* child, BOOL give_focus, BOOL restore
}
}
- std::vector<LLFloater*>::iterator floater_it;
- for(floater_it = floaters_to_move.begin(); floater_it != floaters_to_move.end(); ++floater_it)
+ for (LLFloater* floaterp : floaters_to_move)
{
- LLFloater* floaterp = *floater_it;
sendChildToFront(floaterp);
// always unminimize dependee, but allow dependents to stay minimized
@@ -2569,10 +2566,9 @@ void LLFloaterView::bringToFront(LLFloater* child, BOOL give_focus, BOOL restore
floaters_to_move.clear();
// ...then bringing my own dependents to the front...
- for (LLFloater::handle_set_iter_t dependent_it = child->mDependents.begin();
- dependent_it != child->mDependents.end(); ++dependent_it)
- {
- LLFloater* dependent = dependent_it->get();
+ for (const auto& dep_handle : child->mDependents)
+ {
+ LLFloater* dependent = dep_handle.get();
if (dependent)
{
sendChildToFront(dependent);
@@ -2615,11 +2611,9 @@ void LLFloaterView::highlightFocusedFloater()
}
BOOL floater_or_dependent_has_focus = gFocusMgr.childHasKeyboardFocus(floater);
- for(LLFloater::handle_set_iter_t dependent_it = floater->mDependents.begin();
- dependent_it != floater->mDependents.end();
- ++dependent_it)
+ for(const auto& dep_handle : floater->mDependents)
{
- LLFloater* dependent_floaterp = dependent_it->get();
+ LLFloater* dependent_floaterp = dep_handle.get();
if (dependent_floaterp && gFocusMgr.childHasKeyboardFocus(dependent_floaterp))
{
floater_or_dependent_has_focus = TRUE;
@@ -2629,15 +2623,13 @@ void LLFloaterView::highlightFocusedFloater()
// now set this floater and all its dependents
floater->setForeground(floater_or_dependent_has_focus);
- for(LLFloater::handle_set_iter_t dependent_it = floater->mDependents.begin();
- dependent_it != floater->mDependents.end(); )
- {
- LLFloater* dependent_floaterp = dependent_it->get();
+ for (const auto& dep_handle : floater->mDependents)
+ {
+ LLFloater* dependent_floaterp = dep_handle.get();
if (dependent_floaterp)
{
dependent_floaterp->setForeground(floater_or_dependent_has_focus);
}
- ++dependent_it;
}
floater->cleanupHandles();
@@ -2802,16 +2794,14 @@ void LLFloaterView::hideAllFloaters()
void LLFloaterView::showHiddenFloaters()
{
- for (hidden_floaters_t::iterator it = mHiddenFloaters.begin(), end_it = mHiddenFloaters.end();
- it != end_it;
- ++it)
- {
- LLFloater* floaterp = it->first.get();
+ for (auto& hidden_floater : mHiddenFloaters)
+ {
+ LLFloater* floaterp = hidden_floater.first.get();
if (floaterp)
{
floaterp->setVisible(true);
}
- it->second.disconnect();
+ hidden_floater.second.disconnect();
}
mHiddenFloaters.clear();
}
@@ -2820,9 +2810,9 @@ BOOL LLFloaterView::allChildrenClosed()
{
// see if there are any visible floaters (some floaters "close"
// by setting themselves invisible)
- for (child_list_const_iter_t it = getChildList()->begin(); it != getChildList()->end(); ++it)
+ for (LLView* viewp : *getChildList())
{
- LLFloater* floaterp = dynamic_cast<LLFloater*>(*it);
+ LLFloater* floaterp = dynamic_cast<LLFloater*>(viewp);
if (floaterp->getVisible() && !floaterp->isDead() && floaterp->isCloseable())
{
@@ -2834,9 +2824,9 @@ BOOL LLFloaterView::allChildrenClosed()
void LLFloaterView::shiftFloaters(S32 x_offset, S32 y_offset)
{
- for (child_list_const_iter_t it = getChildList()->begin(); it != getChildList()->end(); ++it)
+ for (LLView* viewp : *getChildList())
{
- LLFloater* floaterp = dynamic_cast<LLFloater*>(*it);
+ LLFloater* floaterp = dynamic_cast<LLFloater*>(viewp);
if (floaterp && floaterp->isMinimized())
{
@@ -2854,9 +2844,9 @@ void LLFloaterView::refresh()
}
// Constrain children to be entirely on the screen
- for ( child_list_const_iter_t child_it = getChildList()->begin(); child_it != getChildList()->end(); ++child_it)
+ for (LLView* viewp : *getChildList())
{
- LLFloater* floaterp = dynamic_cast<LLFloater*>(*child_it);
+ LLFloater* floaterp = dynamic_cast<LLFloater*>(viewp);
if (floaterp && floaterp->getVisible() )
{
// minimized floaters are kept fully onscreen
@@ -2951,12 +2941,11 @@ void LLFloaterView::draw()
if (mFocusCycleMode && focused_floater)
{
- child_list_const_iter_t child_it = getChildList()->begin();
- for (;child_it != getChildList()->end(); ++child_it)
+ for (LLView* viewp : *getChildList())
{
- if ((*child_it) != focused_floater)
+ if (viewp != focused_floater)
{
- drawChild(*child_it);
+ drawChild(viewp);
}
}
@@ -2983,11 +2972,11 @@ LLRect LLFloaterView::getSnapRect() const
LLFloater *LLFloaterView::getFocusedFloater() const
{
- for ( child_list_const_iter_t child_it = getChildList()->begin(); child_it != getChildList()->end(); ++child_it)
+ for (LLView* viewp : *getChildList())
{
- if ((*child_it)->isCtrl())
+ if (viewp->isCtrl())
{
- LLFloater* ctrlp = dynamic_cast<LLFloater*>(*child_it);
+ LLFloater* ctrlp = dynamic_cast<LLFloater*>(viewp);
if ( ctrlp && ctrlp->hasFocus() )
{
return ctrlp;
@@ -2999,9 +2988,8 @@ LLFloater *LLFloaterView::getFocusedFloater() const
LLFloater *LLFloaterView::getFrontmost() const
{
- for ( child_list_const_iter_t child_it = getChildList()->begin(); child_it != getChildList()->end(); ++child_it)
+ for (LLView* viewp : *getChildList())
{
- LLView* viewp = *child_it;
if ( viewp->getVisible() && !viewp->isDead())
{
return (LLFloater *)viewp;
@@ -3013,9 +3001,8 @@ LLFloater *LLFloaterView::getFrontmost() const
LLFloater *LLFloaterView::getBackmost() const
{
LLFloater* back_most = NULL;
- for ( child_list_const_iter_t child_it = getChildList()->begin(); child_it != getChildList()->end(); ++child_it)
+ for (LLView* viewp : *getChildList())
{
- LLView* viewp = *child_it;
if ( viewp->getVisible() )
{
back_most = (LLFloater *)viewp;
@@ -3028,9 +3015,9 @@ void LLFloaterView::syncFloaterTabOrder()
{
// look for a visible modal dialog, starting from first
LLModalDialog* modal_dialog = NULL;
- for ( child_list_const_iter_t child_it = getChildList()->begin(); child_it != getChildList()->end(); ++child_it)
+ for (LLView* viewp : *getChildList())
{
- LLModalDialog* dialog = dynamic_cast<LLModalDialog*>(*child_it);
+ LLModalDialog* dialog = dynamic_cast<LLModalDialog*>(viewp);
if (dialog && dialog->isModal() && dialog->getVisible())
{
modal_dialog = dialog;
@@ -3089,9 +3076,8 @@ LLFloater* LLFloaterView::getParentFloater(LLView* viewp) const
S32 LLFloaterView::getZOrder(LLFloater* child)
{
S32 rv = 0;
- for ( child_list_const_iter_t child_it = getChildList()->begin(); child_it != getChildList()->end(); ++child_it)
+ for (LLView* viewp : *getChildList())
{
- LLView* viewp = *child_it;
if(viewp == child)
{
break;
@@ -3103,10 +3089,8 @@ S32 LLFloaterView::getZOrder(LLFloater* child)
void LLFloaterView::pushVisibleAll(BOOL visible, const skip_list_t& skip_list)
{
- for (child_list_const_iter_t child_iter = getChildList()->begin();
- child_iter != getChildList()->end(); ++child_iter)
+ for (LLView* view : *getChildList())
{
- LLView *view = *child_iter;
if (skip_list.find(view) == skip_list.end())
{
view->pushVisible(visible);
diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp
index 86bff3f6e99..a0e656e2a21 100644
--- a/indra/newview/llchiclet.cpp
+++ b/indra/newview/llchiclet.cpp
@@ -876,11 +876,9 @@ void LLChicletPanel::showScrollButtonsIfNeeded()
void LLChicletPanel::draw()
{
- child_list_const_iter_t it = getChildList()->begin();
- for( ; getChildList()->end() != it; ++it)
+ for (LLView* child : *getChildList())
{
- LLView* child = *it;
- if(child == dynamic_cast<LLView*>(mScrollArea))
+ if(child == static_cast<LLView*>(mScrollArea))
{
LLLocalClipRect clip(mScrollArea->getRect());
drawChild(mScrollArea);
--
GitLab