diff options
| author | Daniel Schürmann <daschuer@mixxx.org> | 2021-01-04 18:46:27 +0100 |
|---|---|---|
| committer | Daniel Schürmann <daschuer@mixxx.org> | 2021-01-04 18:46:27 +0100 |
| commit | b7171a2b97f7671125abe6ebb8bfffd31ff3e14f (patch) | |
| tree | fe1183c2054335bbe8b321dbb88a356aae7a1cbc /src/library/basetracktablemodel.cpp | |
| parent | 4813d0ecab0eed0fece4a7a6868204ba151ea877 (diff) | |
LIBRARYTABLE_LOCATION to LIBRARYTABLE_LOCATION_ID because the column holds only a reference to the track locations table. Use the enum COLUMN_TRACKLOCATIONSTABLE_LOCATION instead of COLUMN_LIBRARYTABLE_NATIVELOCATION becase it points only to the id column. Delete also enums for non existing Playlist table columns.
Diffstat (limited to 'src/library/basetracktablemodel.cpp')
| -rw-r--r-- | src/library/basetracktablemodel.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/library/basetracktablemodel.cpp b/src/library/basetracktablemodel.cpp index ba8ae4c6db..73f26d3734 100644 --- a/src/library/basetracktablemodel.cpp +++ b/src/library/basetracktablemodel.cpp @@ -47,7 +47,7 @@ const QStringList kDefaultTableColumns = { LIBRARYTABLE_GENRE, LIBRARYTABLE_GROUPING, LIBRARYTABLE_KEY, - LIBRARYTABLE_LOCATION, + TRACKLOCATIONSTABLE_LOCATION, LIBRARYTABLE_PLAYED, LIBRARYTABLE_PREVIEW, LIBRARYTABLE_RATING, @@ -189,7 +189,7 @@ void BaseTrackTableModel::initHeaderProperties() { tr("Key"), defaultColumnWidth()); setHeaderProperties( - ColumnCache::COLUMN_LIBRARYTABLE_NATIVELOCATION, + ColumnCache::COLUMN_TRACKLOCATIONSTABLE_LOCATION, tr("Location"), defaultColumnWidth() * 6); setHeaderProperties( @@ -350,7 +350,7 @@ bool BaseTrackTableModel::isColumnHiddenByDefault( column == fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_COMPOSER) || column == fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_FILETYPE) || column == fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_GROUPING) || - column == fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_NATIVELOCATION) || + column == fieldIndex(ColumnCache::COLUMN_TRACKLOCATIONSTABLE_LOCATION) || column == fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_PLAYED) || column == fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_REPLAYGAIN) || column == fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_SAMPLERATE) || @@ -373,7 +373,7 @@ QAbstractItemDelegate* BaseTrackTableModel::delegateForColumn( } else if (PlayerManager::numPreviewDecks() > 0 && index == fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_PREVIEW)) { return new PreviewButtonDelegate(pTableView, index); - } else if (index == fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_NATIVELOCATION)) { + } else if (index == fieldIndex(ColumnCache::COLUMN_TRACKLOCATIONSTABLE_LOCATION)) { return new LocationDelegate(pTableView); } else if (index == fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_COLOR)) { return new ColorDelegate(pTableView); @@ -845,7 +845,7 @@ Qt::ItemFlags BaseTrackTableModel::readWriteFlags( column == fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_DATETIMEADDED) || column == fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_DURATION) || column == fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_FILETYPE) || - column == fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_NATIVELOCATION) || + column == fieldIndex(ColumnCache::COLUMN_TRACKLOCATIONSTABLE_LOCATION) || column == fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_REPLAYGAIN) || column == fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_SAMPLERATE)) { return readOnlyFlags(index); |