From 59de376d05d69191c57b722675e7985d212776d5 Mon Sep 17 00:00:00 2001 From: Zithia Satazaki Date: Mon, 28 Mar 2022 17:20:28 -0400 Subject: [PATCH] kill "might detach" warnings --- xybrid/ui/directorynode.cpp | 10 +++++----- xybrid/ui/gadgets/layoutgadget.cpp | 4 ++-- xybrid/ui/gadgets/sampleselectorgadget.cpp | 4 ++-- xybrid/ui/patterneditorview.cpp | 2 +- xybrid/ui/samplelistmodel.cpp | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/xybrid/ui/directorynode.cpp b/xybrid/ui/directorynode.cpp index 561808b..461a34b 100644 --- a/xybrid/ui/directorynode.cpp +++ b/xybrid/ui/directorynode.cpp @@ -39,7 +39,7 @@ void DirectoryNode::sortChildren() { void DirectoryNode::sortTree() { sortChildren(); - for (auto c : children) c->sortTree(); + for (auto c : qAsConst(children)) c->sortTree(); } DirectoryNode* DirectoryNode::subdir(QString name) { @@ -47,7 +47,7 @@ DirectoryNode* DirectoryNode::subdir(QString name) { QString first = name.section('/', 0, 0, QString::SectionSkipEmpty); QString rest = name.section('/', 1, -1, QString::SectionSkipEmpty); DirectoryNode* sd = nullptr; - for (auto c : children) if (c->isDirectory() && c->name == first) { sd = c; break; } + for (auto c : qAsConst(children)) if (c->isDirectory() && c->name == first) { sd = c; break; } if (!sd) sd = new DirectoryNode(this, first); return sd->subdir(rest); } @@ -69,14 +69,14 @@ DirectoryNode* DirectoryNode::findPath(QString path) { QString first = path.section('/', 0, 0, QString::SectionSkipEmpty); QString rest = path.section('/', 1, -1, QString::SectionSkipEmpty); DirectoryNode* sd = nullptr; - for (auto c : children) if (c->name == first) { sd = c; break; } + for (auto c : qAsConst(children)) if (c->name == first) { sd = c; break; } if (!sd) return nullptr; return sd->findPath(rest); } DirectoryNode* DirectoryNode::findData(const QVariant& d) { if (data == d) return this; - for (auto c : children) { + for (auto c : qAsConst(children)) { if (auto cd = c->findData(d); cd) return cd; } return nullptr; @@ -92,7 +92,7 @@ bool DirectoryNode::isChildOf(Xybrid::UI::DirectoryNode* dn) const { } void DirectoryNode::treeExec(const std::function& f) { - for (auto c : children) c->treeExec(f); + for (auto c : qAsConst(children)) c->treeExec(f); f(this); } diff --git a/xybrid/ui/gadgets/layoutgadget.cpp b/xybrid/ui/gadgets/layoutgadget.cpp index c93d961..718c3be 100644 --- a/xybrid/ui/gadgets/layoutgadget.cpp +++ b/xybrid/ui/gadgets/layoutgadget.cpp @@ -65,13 +65,13 @@ void LayoutGadget::updateGeometry() { qreal cur = margin; auto ms = orient(minSize); qreal h = ms.height(); - for (auto c : childItems()) { + for (auto c : childItems()) { // clazy:exclude=range-loop-detach auto g = static_cast(c); g->updateGeometry(); auto r = orient(g->layoutBoundingRect()); h = std::max(h, r.height()); } - for (auto c : childItems()) { + for (auto c : childItems()) { // clazy:exclude=range-loop-detach auto g = static_cast(c); auto r = orient(g->layoutBoundingRect()); g->centerOn(orient(QPointF(cur + r.width()/2, r.height()/2 + (h - r.height())*bias))); diff --git a/xybrid/ui/gadgets/sampleselectorgadget.cpp b/xybrid/ui/gadgets/sampleselectorgadget.cpp index f2077e5..622339e 100644 --- a/xybrid/ui/gadgets/sampleselectorgadget.cpp +++ b/xybrid/ui/gadgets/sampleselectorgadget.cpp @@ -105,7 +105,7 @@ void SampleSelectorGadget::paint(QPainter* p, const QStyleOptionGraphicsItem* op void SampleSelectorGadget::buildSubmenu(DirectoryNode* dir, QMenu* menu) { auto smp = currentSample.lock(); bool needSeparator = false; - for (auto c : dir->children) { + for (auto c : qAsConst(dir->children)) { if (c->isDirectory()) { needSeparator = true; buildSubmenu(c, menu->addMenu(c->name)); @@ -138,7 +138,7 @@ void SampleSelectorGadget::mousePressEvent(QGraphicsSceneMouseEvent* e) { m->addAction("(no sample)", this, [this] { setSample(nullptr); }); m->addSeparator(); DirectoryNode root; - for (auto s : project->samples) root.placeData(s->name, s->uuid); + for (auto s : qAsConst(project->samples)) root.placeData(s->name, s->uuid); root.sortTree(); buildSubmenu(&root, m); diff --git a/xybrid/ui/patterneditorview.cpp b/xybrid/ui/patterneditorview.cpp index 0416ff2..2bd7a12 100644 --- a/xybrid/ui/patterneditorview.cpp +++ b/xybrid/ui/patterneditorview.cpp @@ -135,7 +135,7 @@ PatternEditorView::PatternEditorView(QWidget *parent) : QTableView(parent) { } else { // note(s) amt = std::clamp(amt, -12, 12); auto cc = new CompositeCommand(); - for (auto s : sel.indexes()) { + for (auto s : sel.indexes()) { // clazy:exclude=range-loop-detach if (s.column() % Util::colsPerChannel != 1) continue; int ch = Util::channelForColumn(s.column()); auto c = new PatternDeltaCommand(p, ch, s.row()-1); diff --git a/xybrid/ui/samplelistmodel.cpp b/xybrid/ui/samplelistmodel.cpp index cbf2cbc..defe9e4 100644 --- a/xybrid/ui/samplelistmodel.cpp +++ b/xybrid/ui/samplelistmodel.cpp @@ -99,7 +99,7 @@ void SampleListModel::refresh() { root = std::make_shared(); auto* project = window->getProject().get(); if (!project) return; - for (auto s : project->samples) root->placeData(s->name, s->uuid); + for (auto s : qAsConst(project->samples)) root->placeData(s->name, s->uuid); root->sortTree(); view->setCurrentIndex(QModelIndex()); @@ -147,7 +147,7 @@ void SampleListModel::propagateSampleNames(DirectoryNode* dn) { if (!dn->data.isNull()) { auto* project = window->getProject().get(); project->samples[dn->data.toUuid()]->name = dn->path(); - } else for (auto c : dn->children) propagateSampleNames(c); + } else for (auto c : qAsConst(dn->children)) propagateSampleNames(c); } bool SampleListModel::setData(const QModelIndex& index, const QVariant& value, int role) {