Skip to content
Snippets Groups Projects
Commit 52eef28f authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

local var name 'set'

parent ec319559
No related branches found
No related tags found
1 merge request!2387unify code for list views
...@@ -31,13 +31,13 @@ int InstrumentsQModel::rowCount(const QModelIndex&) const ...@@ -31,13 +31,13 @@ int InstrumentsQModel::rowCount(const QModelIndex&) const
QVariant InstrumentsQModel::data(const QModelIndex& index, int role) const QVariant InstrumentsQModel::data(const QModelIndex& index, int role) const
{ {
const InstrumentsSet* instruments = gDoc->instruments(); const InstrumentsSet* set = gDoc->instruments();
if (!index.isValid()) if (!index.isValid())
return {}; return {};
size_t row = index.row(); size_t row = index.row();
if (row >= instruments->size()) if (row >= set->size())
return {}; return {};
const InstrumentItem* t = instruments->at(row); const InstrumentItem* t = set->at(row);
if (role == Qt::DisplayRole) if (role == Qt::DisplayRole)
return t->instrumentName(); return t->instrumentName();
return {}; return {};
...@@ -48,9 +48,9 @@ InstrumentItem* InstrumentsQModel::instrumentItemForIndex(const QModelIndex& ind ...@@ -48,9 +48,9 @@ InstrumentItem* InstrumentsQModel::instrumentItemForIndex(const QModelIndex& ind
if (!index.isValid()) if (!index.isValid())
return nullptr; return nullptr;
QVector<InstrumentItem*> instruments = gDoc->instruments()->instrumentItems(); QVector<InstrumentItem*> set = gDoc->instruments()->instrumentItems();
if (index.row() >= 0 && index.row() < instruments.size()) if (index.row() >= 0 && index.row() < set.size())
return instruments[index.row()]; return set[index.row()];
return nullptr; return nullptr;
} }
...@@ -100,14 +100,14 @@ QModelIndex InstrumentsQModel::copyInstrument(const QModelIndex& source) ...@@ -100,14 +100,14 @@ QModelIndex InstrumentsQModel::copyInstrument(const QModelIndex& source)
QModelIndex InstrumentsQModel::copyInstrument(const InstrumentItem* source) QModelIndex InstrumentsQModel::copyInstrument(const InstrumentItem* source)
{ {
InstrumentsSet* instruments = gDoc->instrumentsModifier(); InstrumentsSet* set = gDoc->instrumentsModifier();
const QString copyName = instruments->suggestInstrumentName(source->instrumentName()); const QString copyName = set->suggestInstrumentName(source->instrumentName());
const int row = instruments->instrumentItems().size(); const int row = set->instrumentItems().size();
beginInsertRows({}, row, row); beginInsertRows({}, row, row);
InstrumentItem* copy = instruments->insertItemCopy(*source); InstrumentItem* copy = set->insertItemCopy(*source);
copy->setInstrumentName(copyName); copy->setInstrumentName(copyName);
emit instruments->instrumentAddedOrRemoved(); emit set->instrumentAddedOrRemoved();
endInsertRows(); endInsertRows();
return createIndex(row, 0); return createIndex(row, 0);
...@@ -115,11 +115,11 @@ QModelIndex InstrumentsQModel::copyInstrument(const InstrumentItem* source) ...@@ -115,11 +115,11 @@ QModelIndex InstrumentsQModel::copyInstrument(const InstrumentItem* source)
QModelIndex InstrumentsQModel::pushInstrument(InstrumentItem* t) QModelIndex InstrumentsQModel::pushInstrument(InstrumentItem* t)
{ {
InstrumentsSet* instruments = gDoc->instrumentsModifier(); InstrumentsSet* set = gDoc->instrumentsModifier();
const int row = instruments->instrumentItems().size(); const int row = set->instrumentItems().size();
beginInsertRows({}, row, row); beginInsertRows({}, row, row);
instruments->addInstrumentItem(t); set->addInstrumentItem(t);
endInsertRows(); endInsertRows();
return createIndex(row, 0); return createIndex(row, 0);
...@@ -127,7 +127,7 @@ QModelIndex InstrumentsQModel::pushInstrument(InstrumentItem* t) ...@@ -127,7 +127,7 @@ QModelIndex InstrumentsQModel::pushInstrument(InstrumentItem* t)
void InstrumentsQModel::onInstrumentNameChanged(const InstrumentItem* instrument) void InstrumentsQModel::onInstrumentNameChanged(const InstrumentItem* instrument)
{ {
const auto instruments = gDoc->instruments()->instrumentItems(); const auto set = gDoc->instruments()->instrumentItems();
if (const auto row = instruments.indexOf(instrument); row != -1) if (const auto row = set.indexOf(instrument); row != -1)
emit dataChanged(index(row, 0), index(row, 0)); emit dataChanged(index(row, 0), index(row, 0));
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment