Make SortColumnId an enum class (based on int) and use camelCase for the enum members

2 files changed, 59 insertions, 31 deletions

diff --git a/src/library/browse/browsetablemodel.cpp b/src/library/browse/browsetablemodel.cpp
index 85d91a7754..9f6d0e4d27 100644
--- a/src/library/browse/browsetablemodel.cpp
+++ b/src/library/browse/browsetablemodel.cpp
@@ -68,38 +68,66 @@ BrowseTableModel::BrowseTableModel(QObject* parent,
 
     setDefaultSort(COLUMN_FILENAME, Qt::AscendingOrder);
 
-    for (int i = 0; i < TrackModel::SortColumnId::SORTCOLUMN_ID_MAX; ++i) {
+    for (int i = 0; i < static_cast<int>(TrackModel::SortColumnId::sortColumnIdMax); ++i) {
         m_columnIndexBySortColumnId[i] = -1;
     }
-    m_columnIndexBySortColumnId[TrackModel::SortColumnId::SORTCOLUMN_FILENAME] = COLUMN_FILENAME;
-    m_columnIndexBySortColumnId[TrackModel::SortColumnId::SORTCOLUMN_ARTIST] = COLUMN_ARTIST;
-    m_columnIndexBySortColumnId[TrackModel::SortColumnId::SORTCOLUMN_TITLE] = COLUMN_TITLE;
-    m_columnIndexBySortColumnId[TrackModel::SortColumnId::SORTCOLUMN_ALBUM] = COLUMN_ALBUM;
-    m_columnIndexBySortColumnId[TrackModel::SortColumnId::SORTCOLUMN_ALBUMARTIST] = COLUMN_ALBUMARTIST;
-    m_columnIndexBySortColumnId[TrackModel::SortColumnId::SORTCOLUMN_YEAR] = COLUMN_YEAR;
-    m_columnIndexBySortColumnId[TrackModel::SortColumnId::SORTCOLUMN_GENRE] = COLUMN_GENRE;
-    m_columnIndexBySortColumnId[TrackModel::SortColumnId::SORTCOLUMN_COMPOSER] = COLUMN_COMPOSER;
-    m_columnIndexBySortColumnId[TrackModel::SortColumnId::SORTCOLUMN_GROUPING] = COLUMN_GROUPING;
-    m_columnIndexBySortColumnId[TrackModel::SortColumnId::SORTCOLUMN_TRACKNUMBER] = COLUMN_TRACK_NUMBER;
-    m_columnIndexBySortColumnId[TrackModel::SortColumnId::SORTCOLUMN_FILETYPE] = COLUMN_TYPE;
-    m_columnIndexBySortColumnId[TrackModel::SortColumnId::SORTCOLUMN_NATIVELOCATION] = COLUMN_NATIVELOCATION;
-    m_columnIndexBySortColumnId[TrackModel::SortColumnId::SORTCOLUMN_COMMENT] = COLUMN_COMMENT;
-    m_columnIndexBySortColumnId[TrackModel::SortColumnId::SORTCOLUMN_DURATION] = COLUMN_DURATION;
-    m_columnIndexBySortColumnId[TrackModel::SortColumnId::SORTCOLUMN_BITRATE] = COLUMN_BITRATE;
-    m_columnIndexBySortColumnId[TrackModel::SortColumnId::SORTCOLUMN_BPM] = COLUMN_BPM;
-    m_columnIndexBySortColumnId[TrackModel::SortColumnId::SORTCOLUMN_REPLAYGAIN] = COLUMN_REPLAYGAIN;
-    m_columnIndexBySortColumnId[TrackModel::SortColumnId::SORTCOLUMN_KEY] = COLUMN_KEY;
-    m_columnIndexBySortColumnId[TrackModel::SortColumnId::SORTCOLUMN_PREVIEW] = COLUMN_PREVIEW;
-    m_columnIndexBySortColumnId[TrackModel::SortColumnId::SORTCOLUMN_GROUPING] = COLUMN_GROUPING;
-    m_columnIndexBySortColumnId[TrackModel::SortColumnId::SORTCOLUMN_FILE_MODIFIED_TIME] = COLUMN_FILE_MODIFIED_TIME;
-    m_columnIndexBySortColumnId[TrackModel::SortColumnId::SORTCOLUMN_FILE_CREATION_TIME] = COLUMN_FILE_CREATION_TIME;
+    m_columnIndexBySortColumnId[static_cast<int>(
+            TrackModel::SortColumnId::sortColumnFilename)] = COLUMN_FILENAME;
+    m_columnIndexBySortColumnId[static_cast<int>(
+            TrackModel::SortColumnId::sortColumnArtist)] = COLUMN_ARTIST;
+    m_columnIndexBySortColumnId[static_cast<int>(
+            TrackModel::SortColumnId::sortColumnTitle)] = COLUMN_TITLE;
+    m_columnIndexBySortColumnId[static_cast<int>(
+            TrackModel::SortColumnId::sortColumnAlbum)] = COLUMN_ALBUM;
+    m_columnIndexBySortColumnId[static_cast<int>(
+            TrackModel::SortColumnId::sortColumnAlbumArtist)] =
+            COLUMN_ALBUMARTIST;
+    m_columnIndexBySortColumnId[static_cast<int>(
+            TrackModel::SortColumnId::sortColumnYear)] = COLUMN_YEAR;
+    m_columnIndexBySortColumnId[static_cast<int>(
+            TrackModel::SortColumnId::sortColumnGenre)] = COLUMN_GENRE;
+    m_columnIndexBySortColumnId[static_cast<int>(
+            TrackModel::SortColumnId::sortColumnComposer)] = COLUMN_COMPOSER;
+    m_columnIndexBySortColumnId[static_cast<int>(
+            TrackModel::SortColumnId::sortColumnGrouping)] = COLUMN_GROUPING;
+    m_columnIndexBySortColumnId[static_cast<int>(
+            TrackModel::SortColumnId::sortColumnTrackNumber)] =
+            COLUMN_TRACK_NUMBER;
+    m_columnIndexBySortColumnId[static_cast<int>(
+            TrackModel::SortColumnId::sortColumnFileType)] = COLUMN_TYPE;
+    m_columnIndexBySortColumnId[static_cast<int>(
+            TrackModel::SortColumnId::sortColumnNativeLocation)] =
+            COLUMN_NATIVELOCATION;
+    m_columnIndexBySortColumnId[static_cast<int>(
+            TrackModel::SortColumnId::sortColumnComment)] = COLUMN_COMMENT;
+    m_columnIndexBySortColumnId[static_cast<int>(
+            TrackModel::SortColumnId::sortColumnDuration)] = COLUMN_DURATION;
+    m_columnIndexBySortColumnId[static_cast<int>(
+            TrackModel::SortColumnId::sortColumnBitRate)] = COLUMN_BITRATE;
+    m_columnIndexBySortColumnId[static_cast<int>(
+            TrackModel::SortColumnId::sortColumnBpm)] = COLUMN_BPM;
+    m_columnIndexBySortColumnId[static_cast<int>(
+            TrackModel::SortColumnId::sortColumnReplayGain)] =
+            COLUMN_REPLAYGAIN;
+    m_columnIndexBySortColumnId[static_cast<int>(
+            TrackModel::SortColumnId::sortColumnKey)] = COLUMN_KEY;
+    m_columnIndexBySortColumnId[static_cast<int>(
+            TrackModel::SortColumnId::sortColumnPreview)] = COLUMN_PREVIEW;
+    m_columnIndexBySortColumnId[static_cast<int>(
+            TrackModel::SortColumnId::sortColumnGrouping)] = COLUMN_GROUPING;
+    m_columnIndexBySortColumnId[static_cast<int>(
+            TrackModel::SortColumnId::sortColumnFileModifiedTime)] =
+            COLUMN_FILE_MODIFIED_TIME;
+    m_columnIndexBySortColumnId[static_cast<int>(
+            TrackModel::SortColumnId::sortColumnFileCreationTime)] =
+            COLUMN_FILE_CREATION_TIME;
 
     m_sortColumnIdByColumnIndex.clear();
-    for (int i = TrackModel::SortColumnId::SORTCOLUMN_ID_MIN;
-            i < TrackModel::SortColumnId::SORTCOLUMN_ID_MAX;
+    for (int i = static_cast<int>(TrackModel::SortColumnId::sortColumnIdMin);
+            i < static_cast<int>(TrackModel::SortColumnId::sortColumnIdMax);
             ++i) {
         TrackModel::SortColumnId sortColumn = static_cast<TrackModel::SortColumnId>(i);
-        int columnIndex = m_columnIndexBySortColumnId[sortColumn];
+        int columnIndex = m_columnIndexBySortColumnId[static_cast<int>(sortColumn)];
         if (columnIndex >= 0) {
             m_sortColumnIdByColumnIndex.insert(columnIndex, sortColumn);
         }
@@ -135,16 +163,16 @@ BrowseTableModel::~BrowseTableModel() {
 }
 
 int BrowseTableModel::columnIndexFromSortColumnId(TrackModel::SortColumnId column) {
-    if (column < TrackModel::SortColumnId::SORTCOLUMN_ID_MIN ||
-            column >= TrackModel::SortColumnId::SORTCOLUMN_ID_MAX) {
+    if (column < TrackModel::SortColumnId::sortColumnIdMin ||
+            column >= TrackModel::SortColumnId::sortColumnIdMax) {
         return -1;
     }
 
-    return m_columnIndexBySortColumnId[column];
+    return m_columnIndexBySortColumnId[static_cast<int>(column)];
 }
 
 TrackModel::SortColumnId BrowseTableModel::sortColumnIdFromColumnIndex(int index) {
-    return m_sortColumnIdByColumnIndex.value(index, TrackModel::SortColumnId::SORTCOLUMN_INVALID);
+    return m_sortColumnIdByColumnIndex.value(index, TrackModel::SortColumnId::sortColumnInvalid);
 }
 
 const QList<int>& BrowseTableModel::searchColumns() const {
diff --git a/src/library/browse/browsetablemodel.h b/src/library/browse/browsetablemodel.h
index 7a33b265a2..686527348c 100644
--- a/src/library/browse/browsetablemodel.h
+++ b/src/library/browse/browsetablemodel.h
@@ -88,7 +88,7 @@ class BrowseTableModel final : public QStandardItemModel, public virtual TrackMo
     RecordingManager* m_pRecordingManager;
     BrowseThreadPointer m_pBrowseThread;
     QString m_previewDeckGroup;
-    int m_columnIndexBySortColumnId[TrackModel::SortColumnId::SORTCOLUMN_ID_MAX];
+    int m_columnIndexBySortColumnId[TrackModel::SortColumnId::sortColumnIdMax];
     QMap<int, TrackModel::SortColumnId> m_sortColumnIdByColumnIndex;
 
 };