use enum instead of magic numbers in EngineConfigurationModel

ilaripih · ilaripih · commit bfc6995a6d68 · 2025-06-06T15:24:30.000+03:00
Also remove a couple of needless includes.
diff --git a/projects/gui/src/engineconfigproxymodel.cpp b/projects/gui/src/engineconfigproxymodel.cpp
@@ -17,6 +17,7 @@
 */
 
 #include "engineconfigproxymodel.h"
+#include "engineconfigurationmodel.h"
 #include <QStringList>
 
 EngineConfigurationProxyModel::EngineConfigurationProxyModel(QObject *parent)
@@ -35,7 +36,8 @@ bool EngineConfigurationProxyModel::filterAcceptsRow(int sourceRow,
 {
 	if (!m_filterVariant.isEmpty())
 	{
-		QModelIndex variantsIndex = sourceModel()->index(sourceRow, 4, sourceParent);
+		QModelIndex variantsIndex = sourceModel()->index(
+			sourceRow, EngineConfigurationModel::VariantsColumn, sourceParent);
 		QStringList variants(sourceModel()->data(variantsIndex).toStringList());
 
 		if (!variants.contains(m_filterVariant))
diff --git a/projects/gui/src/engineconfigurationmodel.cpp b/projects/gui/src/engineconfigurationmodel.cpp
@@ -80,15 +80,15 @@ QVariant EngineConfigurationModel::data(const QModelIndex& index, int role) cons
 
 		switch (index.column())
 		{
-		case 0:
+		case NameColumn:
 			return engine.name();
-		case 1:
+		case CommandColumn:
 			return engine.command();
-		case 2:
+		case WorkdirColumn:
 			return engine.workingDirectory();
-		case 3:
+		case ProtocolColumn:
 			return engine.protocol();
-		case 4:
+		case VariantsColumn:
 			return engine.supportedVariants();
 		default:
 			return QVariant();
@@ -123,15 +123,15 @@ QVariant EngineConfigurationModel::headerData(int section, Qt::Orientation orien
 	{
 		switch (section)
 		{
-		case 0:
+		case NameColumn:
 			return tr("Name");
-		case 1:
+		case CommandColumn:
 			return tr("Command");
-		case 2:
+		case WorkdirColumn:
 			return tr("Working Directory");
-		case 3:
+		case ProtocolColumn:
 			return tr("Protocol");
-		case 4:
+		case VariantsColumn:
 			return tr("Variants");
 		default:
 			return QVariant();
diff --git a/projects/gui/src/engineconfigurationmodel.h b/projects/gui/src/engineconfigurationmodel.h
@@ -22,7 +22,6 @@
 #include <QAbstractListModel>
 class EngineManager;
 
-
 /*!
  * \brief The EngineConfigurationModel class represents a chess engine
  * configuration based model.
@@ -45,6 +44,16 @@ class EngineConfigurationModel : public QAbstractListModel
 	Q_OBJECT
 
 	public:
+		/*! Columns in the model. */
+		enum Column
+		{
+			NameColumn,		//!< Engine name
+			CommandColumn,	//!< Engine start command
+			WorkdirColumn,	//!< Engine's working directory
+			ProtocolColumn,	//!< Engine's chess communication protocol
+			VariantsColumn,	//!< Chess variants supported by engine
+		};
+
 		/*!
 		 * Creates an empty model.
 		*/
diff --git a/projects/gui/src/enginemanagementwidget.cpp b/projects/gui/src/enginemanagementwidget.cpp
@@ -22,7 +22,6 @@
 #include <QSortFilterProxyModel>
 #include <QFileDialog>
 #include <QSettings>
-#include <functional>
 #include <algorithm>
 
 #include <enginemanager.h>
diff --git a/projects/gui/src/newgamedlg.cpp b/projects/gui/src/newgamedlg.cpp
@@ -33,7 +33,6 @@
 #include "engineconfigurationmodel.h"
 #include "engineconfigproxymodel.h"
 #include "engineconfigurationdlg.h"
-#include "pairtimecontroldlg.h"
 #include "stringvalidator.h"
 
 #if 0

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`*/`
`18`	`18`
`19`	`19`	`#include "engineconfigproxymodel.h"`
	`20`	`+#include "engineconfigurationmodel.h"`
`20`	`21`	`#include <QStringList>`
`21`	`22`
`22`	`23`	`EngineConfigurationProxyModel::EngineConfigurationProxyModel(QObject *parent)`
`@@ -35,7 +36,8 @@ bool EngineConfigurationProxyModel::filterAcceptsRow(int sourceRow,`
`35`	`36`	`{`
`36`	`37`	`if (!m_filterVariant.isEmpty())`
`37`	`38`	`{`
`38`		`- QModelIndex variantsIndex = sourceModel()->index(sourceRow, 4, sourceParent);`
	`39`	`+ QModelIndex variantsIndex = sourceModel()->index(`
	`40`	`+ sourceRow, EngineConfigurationModel::VariantsColumn, sourceParent);`
`39`	`41`	`QStringList variants(sourceModel()->data(variantsIndex).toStringList());`
`40`	`42`
`41`	`43`	`if (!variants.contains(m_filterVariant))`