From 8477fdc7e164777296c7127a8f170a428ba30446 Mon Sep 17 00:00:00 2001 From: Sergio Martins Date: Sun, 17 May 2020 19:14:50 +0100 Subject: [PATCH] Fix detachments --- src/LayoutSaver.cpp | 2 +- src/private/DockRegistry.cpp | 2 +- src/private/FloatingWindow.cpp | 2 +- src/private/Frame.cpp | 2 +- src/private/multisplitter/Item.cpp | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/LayoutSaver.cpp b/src/LayoutSaver.cpp index 4363aeb1..fd782d81 100644 --- a/src/LayoutSaver.cpp +++ b/src/LayoutSaver.cpp @@ -521,7 +521,7 @@ void LayoutSaver::Frame::fromVariantMap(const QVariantMap &map) options = map.value(QStringLiteral("options")).toUInt(); currentTabIndex = map.value(QStringLiteral("currentTabIndex")).toInt(); - QVariantList dockWidgetsV = map.value(QStringLiteral("dockWidgets")).toList(); + const QVariantList dockWidgetsV = map.value(QStringLiteral("dockWidgets")).toList(); dockWidgets.clear(); dockWidgets.reserve(dockWidgetsV.size()); diff --git a/src/private/DockRegistry.cpp b/src/private/DockRegistry.cpp index 850c5e1b..140aeb14 100644 --- a/src/private/DockRegistry.cpp +++ b/src/private/DockRegistry.cpp @@ -69,7 +69,7 @@ bool DockRegistry::isEmpty() const void DockRegistry::checkSanityAll(bool dumpLayout) { - for (auto layout : m_layouts) { + for (auto layout : qAsConst(m_layouts)) { layout->checkSanity(); if (dumpLayout) layout->dumpDebug(); diff --git a/src/private/FloatingWindow.cpp b/src/private/FloatingWindow.cpp index 8adaf77e..3231acb9 100644 --- a/src/private/FloatingWindow.cpp +++ b/src/private/FloatingWindow.cpp @@ -378,7 +378,7 @@ void FloatingWindow::onCloseEvent(QCloseEvent *e) e->accept(); // Accepted by default (will close unless ignored) - Frame::List frames = this->frames(); + const Frame::List frames = this->frames(); for (Frame *frame : frames) { qApp->sendEvent(frame, e); if (!e->isAccepted()) diff --git a/src/private/Frame.cpp b/src/private/Frame.cpp index 8c8a9437..f73e6338 100644 --- a/src/private/Frame.cpp +++ b/src/private/Frame.cpp @@ -305,7 +305,7 @@ void Frame::onCloseEvent(QCloseEvent *e) { qCDebug(closing) << "Frame::closeEvent"; e->accept(); // Accepted by default (will close unless ignored) - DockWidgetBase::List docks = dockWidgets(); + const DockWidgetBase::List docks = dockWidgets(); for (DockWidgetBase *dock : docks) { qApp->sendEvent(dock, e); if (!e->isAccepted()) diff --git a/src/private/multisplitter/Item.cpp b/src/private/multisplitter/Item.cpp index 632ad04b..f983f411 100644 --- a/src/private/multisplitter/Item.cpp +++ b/src/private/multisplitter/Item.cpp @@ -1855,7 +1855,7 @@ void ItemContainer::dumpLayout(int level) : QString(); const QString typeStr = isRoot() ? QStringLiteral("* Root: ") - : "* Layout: "; + : QStringLiteral("* Layout: "); qDebug().noquote() << indent << typeStr << m_orientation << m_sizingInfo.geometry /*<< "r=" << m_geometry.right() << "b=" << m_geometry.bottom()*/ @@ -1883,7 +1883,7 @@ void ItemContainer::updateChildPercentages() return; const int usable = usableLength(); - for (Item *item : m_children) { + for (Item *item : qAsConst(m_children)) { if (item->isVisible() && !item->isBeingInserted()) { item->m_sizingInfo.percentageWithinParent = (1.0 * item->length(m_orientation)) / usable; auto p = item->m_sizingInfo.percentageWithinParent;