XboardEngine: use QStringView in parseFeatures

artoj · artoj · commit bb8699781a57 · 2025-06-06T09:08:09.000+03:00
This is a continuation of the previous work to move protocol parsing to
QStringView based API.
diff --git a/projects/lib/src/xboardengine.cpp b/projects/lib/src/xboardengine.cpp
@@ -717,8 +717,7 @@ void XboardEngine::parseLine(const QString& line)
 	}
 	else if (command == QLatin1String("feature"))
 	{
-		// XXX: parseFeatures() should use QStringView
-		for (const XboardFeature& feature : parseFeatures(args.toString())) {
+		for (const XboardFeature& feature : parseFeatures(args)) {
 			setFeature(feature.first, feature.second);
 		}
 	}
@@ -759,10 +758,12 @@ void XboardEngine::sendOption(const QString& name, const QVariant& value)
 	}
 }
 
-QList<XboardFeature> XboardEngine::parseFeatures(const QString& featureArgs)
+QList<XboardFeature> XboardEngine::parseFeatures(QStringView featureArgs)
 {
 	QList<XboardFeature> features;
 	QRegularExpression re("(\\w+)\\s*=\\s*(\"[^\"]+\"|\\w+)");
+	// XXX: use QRegularExpression::globalMatchView() on Qt 6.5+ and
+	//      make a copy of the string only on `features.append(...)`
 	auto i = re.globalMatch(featureArgs);
 
 	while (i.hasNext())
diff --git a/projects/lib/src/xboardengine.h b/projects/lib/src/xboardengine.h
@@ -56,7 +56,7 @@ class LIB_EXPORT XboardEngine : public ChessEngine
 		virtual bool restartsBetweenGames() const;
 
 		/*! Parses a feature string from the engine. */
-		QList<XboardFeature> parseFeatures(const QString& featureArgs);
+		QList<XboardFeature> parseFeatures(QStringView featureArgs);
 
 		/*! Parses a principal valuation string from the engine. */
 		MoveEvaluation parsePv(QStringView pvString);

Original file line number	Diff line number	Diff line change
`@@ -717,8 +717,7 @@ void XboardEngine::parseLine(const QString& line)`
`717`	`717`	`}`
`718`	`718`	`else if (command == QLatin1String("feature"))`
`719`	`719`	`{`
`720`		`- // XXX: parseFeatures() should use QStringView`
`721`		`- for (const XboardFeature& feature : parseFeatures(args.toString())) {`
	`720`	`+ for (const XboardFeature& feature : parseFeatures(args)) {`
`722`	`721`	`setFeature(feature.first, feature.second);`
`723`	`722`	`}`
`724`	`723`	`}`
`@@ -759,10 +758,12 @@ void XboardEngine::sendOption(const QString& name, const QVariant& value)`
`759`	`758`	`}`
`760`	`759`	`}`
`761`	`760`
`762`		`-QList<XboardFeature> XboardEngine::parseFeatures(const QString& featureArgs)`
	`761`	`+QList<XboardFeature> XboardEngine::parseFeatures(QStringView featureArgs)`
`763`	`762`	`{`
`764`	`763`	`QList<XboardFeature> features;`
`765`	`764`	`QRegularExpression re("(\\w+)\\s=\\s(\"[^\"]+\"\|\\w+)");`
	`765`	`+ // XXX: use QRegularExpression::globalMatchView() on Qt 6.5+ and`
	`766`	+ // make a copy of the string only on `features.append(...)`
`766`	`767`	`auto i = re.globalMatch(featureArgs);`
`767`	`768`
`768`	`769`	`while (i.hasNext())`