Changed values of the SORTCOLUMNID enumeration

-1 -> Invalid
0  -> Current index
1...30 Hardcoded indices of teh sort columns

1 files changed, 4 insertions, 2 deletions

diff --git a/src/library/basesqltablemodel.cpp b/src/library/basesqltablemodel.cpp
index b577d9048c..71f9c42aec 100644
--- a/src/library/basesqltablemodel.cpp
+++ b/src/library/basesqltablemodel.cpp
@@ -70,7 +70,7 @@ void BaseSqlTableModel::initHeaderProperties() {
 
 void BaseSqlTableModel::initSortColumnMapping() {
     // Add a bijective mapping between the SortColumnIds and column indices
-    for (int i = 0; i < TrackModel::SortColumnId::NUM_SORTCOLUMNIDS; ++i) {
+    for (int i = 0; i < TrackModel::SortColumnId::SORTCOLUMN_ID_MAX; ++i) {
         m_columnIndexBySortColumnId[i] = -1;
     }
     m_columnIndexBySortColumnId[TrackModel::SortColumnId::SORTCOLUMN_ARTIST] = fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_ARTIST);
@@ -99,7 +99,9 @@ void BaseSqlTableModel::initSortColumnMapping() {
     m_columnIndexBySortColumnId[TrackModel::SortColumnId::SORTCOLUMN_SAMPLERATE] = fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_SAMPLERATE);
 
     m_sortColumnIdByColumnIndex.clear();
-    for (int i = 0; i < TrackModel::SortColumnId::NUM_SORTCOLUMNIDS; ++i) {
+    for (int i = TrackModel::SortColumnId::SORTCOLUMN_ID_MIN;
+            i < TrackModel::SortColumnId::SORTCOLUMN_ID_MAX;
+            ++i) {
         TrackModel::SortColumnId sortColumn = static_cast<TrackModel::SortColumnId>(i);
         m_sortColumnIdByColumnIndex.insert(m_columnIndexBySortColumnId[sortColumn], sortColumn);
     }