Skip to content

Commit 5995cf9

Browse files
committed
BaseSqlTablemodel RowInfo: rename metadata -> columnValues
1 parent 096e7f9 commit 5995cf9

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

src/library/basesqltablemodel.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -283,9 +283,9 @@ void BaseSqlTableModel::select() {
283283
rowInfo.trackId = trackId;
284284
rowInfo.row = rowInfos.size();
285285

286-
rowInfo.metadata.reserve(sqlRecord.count());
286+
rowInfo.columnValues.reserve(sqlRecord.count());
287287
for (int i = 0; i < m_tableColumns.size(); ++i) {
288-
rowInfo.metadata.push_back(sqlRecord.value(i));
288+
rowInfo.columnValues.push_back(sqlRecord.value(i));
289289
}
290290
rowInfos.push_back(rowInfo);
291291
}
@@ -674,13 +674,13 @@ QVariant BaseSqlTableModel::rawValue(
674674
return previewDeckTrackId() == trackId;
675675
}
676676

677-
const QVector<QVariant>& columns = rowInfo.metadata;
677+
const QVector<QVariant>& columnValues = rowInfo.columnValues;
678678
if (sDebug) {
679679
qDebug() << "Returning table-column value"
680-
<< columns.at(column)
681-
<< "for column" << column;
680+
<< columnValues.at(column)
681+
<< "for column" << column;
682682
}
683-
return columns[column];
683+
return columnValues[column];
684684
}
685685

686686
// Otherwise, return the information from the track record cache for the

src/library/basesqltablemodel.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,14 +129,14 @@ class BaseSqlTableModel : public BaseTrackTableModel {
129129
struct RowInfo {
130130
TrackId trackId;
131131
int row;
132-
QVector<QVariant> metadata;
132+
QVector<QVariant> columnValues;
133133

134134
int getPosition(int posCol) const {
135135
if (posCol < 0) {
136136
return -1;
137137
}
138138
bool ok = false;
139-
int pos = metadata.at(posCol).toInt(&ok);
139+
int pos = columnValues.at(posCol).toInt(&ok);
140140
if (ok) {
141141
return pos;
142142
}

0 commit comments

Comments
 (0)