From 52eef28f2ec5c21bfd92416f1a0ba0e0c496a75c Mon Sep 17 00:00:00 2001 From: Joachim Wuttke <j.wuttke@fz-juelich.de> Date: Sun, 18 Feb 2024 09:05:35 +0100 Subject: [PATCH] local var name 'set' --- GUI/View/List/InstrumentsQModel.cpp | 32 ++++++++++++++--------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/GUI/View/List/InstrumentsQModel.cpp b/GUI/View/List/InstrumentsQModel.cpp index ad2e2e23faa..3b6079c1a16 100644 --- a/GUI/View/List/InstrumentsQModel.cpp +++ b/GUI/View/List/InstrumentsQModel.cpp @@ -31,13 +31,13 @@ int InstrumentsQModel::rowCount(const QModelIndex&) const QVariant InstrumentsQModel::data(const QModelIndex& index, int role) const { - const InstrumentsSet* instruments = gDoc->instruments(); + const InstrumentsSet* set = gDoc->instruments(); if (!index.isValid()) return {}; size_t row = index.row(); - if (row >= instruments->size()) + if (row >= set->size()) return {}; - const InstrumentItem* t = instruments->at(row); + const InstrumentItem* t = set->at(row); if (role == Qt::DisplayRole) return t->instrumentName(); return {}; @@ -48,9 +48,9 @@ InstrumentItem* InstrumentsQModel::instrumentItemForIndex(const QModelIndex& ind if (!index.isValid()) return nullptr; - QVector<InstrumentItem*> instruments = gDoc->instruments()->instrumentItems(); - if (index.row() >= 0 && index.row() < instruments.size()) - return instruments[index.row()]; + QVector<InstrumentItem*> set = gDoc->instruments()->instrumentItems(); + if (index.row() >= 0 && index.row() < set.size()) + return set[index.row()]; return nullptr; } @@ -100,14 +100,14 @@ QModelIndex InstrumentsQModel::copyInstrument(const QModelIndex& source) QModelIndex InstrumentsQModel::copyInstrument(const InstrumentItem* source) { - InstrumentsSet* instruments = gDoc->instrumentsModifier(); - const QString copyName = instruments->suggestInstrumentName(source->instrumentName()); - const int row = instruments->instrumentItems().size(); + InstrumentsSet* set = gDoc->instrumentsModifier(); + const QString copyName = set->suggestInstrumentName(source->instrumentName()); + const int row = set->instrumentItems().size(); beginInsertRows({}, row, row); - InstrumentItem* copy = instruments->insertItemCopy(*source); + InstrumentItem* copy = set->insertItemCopy(*source); copy->setInstrumentName(copyName); - emit instruments->instrumentAddedOrRemoved(); + emit set->instrumentAddedOrRemoved(); endInsertRows(); return createIndex(row, 0); @@ -115,11 +115,11 @@ QModelIndex InstrumentsQModel::copyInstrument(const InstrumentItem* source) QModelIndex InstrumentsQModel::pushInstrument(InstrumentItem* t) { - InstrumentsSet* instruments = gDoc->instrumentsModifier(); - const int row = instruments->instrumentItems().size(); + InstrumentsSet* set = gDoc->instrumentsModifier(); + const int row = set->instrumentItems().size(); beginInsertRows({}, row, row); - instruments->addInstrumentItem(t); + set->addInstrumentItem(t); endInsertRows(); return createIndex(row, 0); @@ -127,7 +127,7 @@ QModelIndex InstrumentsQModel::pushInstrument(InstrumentItem* t) void InstrumentsQModel::onInstrumentNameChanged(const InstrumentItem* instrument) { - const auto instruments = gDoc->instruments()->instrumentItems(); - if (const auto row = instruments.indexOf(instrument); row != -1) + const auto set = gDoc->instruments()->instrumentItems(); + if (const auto row = set.indexOf(instrument); row != -1) emit dataChanged(index(row, 0), index(row, 0)); } -- GitLab