Speed up control flow when initializing track table headers

daschuer · Oct 19, 2024 · 6cf045a · 6cf045a
1 parent 77f9632
commit 6cf045a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 24 deletions.
diff --git a/src/library/basetracktablemodel.cpp b/src/library/basetracktablemodel.cpp
@@ -124,19 +124,21 @@ void BaseTrackTableModel::initTableColumnsAndHeaderProperties(
 
     // Reset the column headers.
     m_columnHeaders.clear();
-    m_columnHeaders.resize(tableColumns.size());
 
-    // Init the header properties of selected/visible columns.
-    initHeaderProperties();
-}
+    VERIFY_OR_DEBUG_ASSERT(tableColumns.size() > 0) {
+        return;
+    }
+
+    m_columnHeaders.resize(tableColumns.size());
 
-void BaseTrackTableModel::initHeaderProperties() {
     // Init the mapping of all columns, even for internal columns that are
     // hidden/invisible. Otherwise mapColumn() would not return a valid result
     // for those columns.
     for (int column = 0; column < ColumnCache::NUM_COLUMNS; ++column) {
         setHeaderProperties(static_cast<ColumnCache::Column>(column));
     }
+
+    emit headerDataChanged(Qt::Horizontal, 0, tableColumns.size() - 1);
 }
 
 void BaseTrackTableModel::setHeaderProperties(ColumnCache::Column column) {
@@ -149,21 +151,10 @@ void BaseTrackTableModel::setHeaderProperties(ColumnCache::Column column) {
         return;
     }
     m_columnHeaders[section].column = column;
-    setHeaderData(
-            section,
-            Qt::Horizontal,
-            m_columnCache.columnName(column),
-            TrackModel::kHeaderNameRole);
-    setHeaderData(
-            section,
-            Qt::Horizontal,
-            m_columnCache.columnTitle(column),
-            Qt::DisplayRole);
-    setHeaderData(
-            section,
-            Qt::Horizontal,
-            m_columnCache.columnDefaultWidth(column),
-            TrackModel::kHeaderWidthRole);
+    m_columnHeaders[section].header[TrackModel::kHeaderNameRole] = m_columnCache.columnName(column);
+    m_columnHeaders[section].header[Qt::DisplayRole] = m_columnCache.columnTitle(column);
+    m_columnHeaders[section].header[TrackModel::kHeaderWidthRole] =
+            m_columnCache.columnDefaultWidth(column);
 }
 
 bool BaseTrackTableModel::setHeaderData(

diff --git a/src/library/basetracktablemodel.h b/src/library/basetracktablemodel.h
@@ -158,8 +158,6 @@ class BaseTrackTableModel : public QAbstractTableModel, public TrackModel {
     //  Overridable functions
     ///////////////////////////////////////////////////////
 
-    virtual void initHeaderProperties();
-
     // Use this if you want a model that is read-only.
     virtual Qt::ItemFlags readOnlyFlags(
             const QModelIndex& index) const;

diff --git a/src/library/trackmodel.h b/src/library/trackmodel.h
@@ -15,8 +15,8 @@
 /// which display track lists.
 class TrackModel {
   public:
-    static const int kHeaderWidthRole = Qt::UserRole + 0;
-    static const int kHeaderNameRole = Qt::UserRole + 1;
+    static constexpr int kHeaderWidthRole = Qt::UserRole + 0;
+    static constexpr int kHeaderNameRole = Qt::UserRole + 1;
     // This role is used for data export like in CSV files
     static constexpr int kDataExportRole = Qt::UserRole + 2;