From df86972ea754ca8c63173588970785cef2122a5f Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 10 Mar 2020 12:22:56 -0500
Subject: [PATCH] [netinstall] Introduce constexpr names for columns and roles

---
 src/modules/netinstall/PackageModel.cpp |  6 +++---
 src/modules/netinstall/PackageModel.h   | 10 ++++++++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/modules/netinstall/PackageModel.cpp b/src/modules/netinstall/PackageModel.cpp
index f0bd3a962..f50273a7c 100644
--- a/src/modules/netinstall/PackageModel.cpp
+++ b/src/modules/netinstall/PackageModel.cpp
@@ -117,7 +117,7 @@ PackageModel::data( const QModelIndex& index, int role ) const
     }
 
     PackageTreeItem* item = static_cast< PackageTreeItem* >( index.internalPointer() );
-    if ( index.column() == 0 && role == Qt::CheckStateRole )
+    if ( index.column() == NameColumn && role == Qt::CheckStateRole )
     {
         return item->isSelected();
     }
@@ -156,7 +156,7 @@ PackageModel::flags( const QModelIndex& index ) const
     {
         return Qt::ItemFlags();
     }
-    if ( index.column() == 0 )
+    if ( index.column() == NameColumn )
     {
         return Qt::ItemIsUserCheckable | QAbstractItemModel::flags( index );
     }
@@ -168,7 +168,7 @@ PackageModel::headerData( int section, Qt::Orientation orientation, int role ) c
 {
     if ( orientation == Qt::Horizontal && role == Qt::DisplayRole )
     {
-        return ( section == 0 ) ? tr( "Name" ) : tr( "Description" );
+        return ( section == NameColumn ) ? tr( "Name" ) : tr( "Description" );
     }
     return QVariant();
 }
diff --git a/src/modules/netinstall/PackageModel.h b/src/modules/netinstall/PackageModel.h
index 25965cb7f..b76a58a42 100644
--- a/src/modules/netinstall/PackageModel.h
+++ b/src/modules/netinstall/PackageModel.h
@@ -39,6 +39,16 @@ class PackageModel : public QAbstractItemModel
 public:
     using PackageItemDataList = QList< PackageTreeItem::ItemData >;
 
+    // Names for columns (unused in the code)
+    static constexpr const int NameColumn = 0;
+    static constexpr const int DescriptionColumn = 1;
+
+    /* The only interesting roles are DisplayRole (with text depending
+     * on the column, and MetaExpandRole which tells if an index
+     * should be initially expanded.
+     */
+    static constexpr const int MetaExpandRole = Qt::UserRole + 1;
+
     explicit PackageModel( const YAML::Node& data, QObject* parent = nullptr );
     ~PackageModel() override;