forked from qt-creator/qt-creator
AdvancedDockingSystem: Add const reference into range-for loops
(cherry picked from commit 0a8c1d6e85de2ac4d73145886cf8a593f90de171) Change-Id: I623e6d315180596c0dcd5bf09982e27428b4674a Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
@@ -106,13 +106,15 @@ namespace ADS
|
||||
void hideFloatingWidgets()
|
||||
{
|
||||
// Hide updates of floating widgets from user
|
||||
for (auto floatingWidget : std::as_const(m_floatingWidgets))
|
||||
floatingWidget->hide();
|
||||
for (const auto &floatingWidget : std::as_const(m_floatingWidgets)) {
|
||||
if (floatingWidget)
|
||||
floatingWidget->hide();
|
||||
}
|
||||
}
|
||||
|
||||
void markDockWidgetsDirty()
|
||||
{
|
||||
for (auto dockWidget : std::as_const(m_dockWidgetsMap))
|
||||
for (const auto &dockWidget : std::as_const(m_dockWidgetsMap))
|
||||
dockWidget->setProperty("dirty", true);
|
||||
}
|
||||
|
||||
@@ -328,18 +330,11 @@ namespace ADS
|
||||
|
||||
// Using a temporal vector since the destructor of
|
||||
// FloatingDockWidgetContainer alters d->m_floatingWidgets.
|
||||
std::vector<FloatingDockContainer *> aboutToDeletes;
|
||||
for (auto floatingWidget : std::as_const(d->m_floatingWidgets)) {
|
||||
const auto copy = d->m_floatingWidgets;
|
||||
for (const auto &floatingWidget : copy) {
|
||||
if (floatingWidget)
|
||||
aboutToDeletes.push_back(floatingWidget);
|
||||
delete floatingWidget.get();
|
||||
}
|
||||
|
||||
for (auto del : aboutToDeletes) {
|
||||
delete del;
|
||||
}
|
||||
|
||||
d->m_floatingWidgets.clear();
|
||||
|
||||
delete d;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user