Strings: Replace QStringRef with QStringView

Signed-off-by: Tobias Klausmann <[email protected]>

Author: tjkl1

src/dvb/xmltv.cpp

@@ -85,10 +85,10 @@ DvbEpgLangEntry *XmlTv::getLangEntry(DvbEpgEntry &epgEntry,
 bool XmlTv::parseChannel(void)
 {
 	const QString emptyString("");
-	QStringRef empty(&emptyString);
+	QStringView empty(emptyString);
 
 	const QXmlStreamAttributes attrs = r->attributes();
-	QStringRef channelName = attrs.value("id");
+	QStringView channelName = attrs.value("id");
 	QList<QString>list;
 
 	QString current = r->name().toString();
@@ -103,7 +103,7 @@ bool XmlTv::parseChannel(void)
 		if (t != QXmlStreamReader::StartElement)
 			continue;
 
-		QStringRef name = r->name();
+		QStringView name = r->name();
 		if (name == QLatin1String("display-name")) {
 			QString display = r->readElementText();
 			list.append(display);
@@ -250,10 +250,10 @@ QString XmlTv::parseCredits(void)
 bool XmlTv::parseProgram(void)
 {
 	const QString emptyString("");
-	QStringRef empty(&emptyString);
+	QStringView empty(emptyString);
 
 	QXmlStreamAttributes attrs = r->attributes();
-	QStringRef channelName = attrs.value("channel");
+	QStringView channelName = attrs.value("channel");
 	QHash<QString, QList<QString>>::ConstIterator it;
 
 	it = channelMap.constFind(channelName.toString());
@@ -334,7 +334,7 @@ bool XmlTv::parseProgram(void)
 			continue;
 
 		QString lang;
-		QStringRef element = r->name();
+		QStringView element = r->name();
 		if (element == QLatin1String("title")) {
 			attrs = r->attributes();
 			lang = IsoCodes::code2Convert(attrs.value("lang").toString());
@@ -598,7 +598,7 @@ bool XmlTv::load(QString file)
 		if (r->readNext() != QXmlStreamReader::StartElement)
 			continue;
 
-		QStringRef name = r->name();
+		QStringView name = r->name();
 
 		if (name == QLatin1String("channel")) {
 			if (!parseChannel())

src/iso-codes.cpp

@@ -61,7 +61,7 @@ namespace IsoCodes
 		bool inDoc = false;
 		while (!r.atEnd()) {
 			const QXmlStreamReader::TokenType t = r.readNext();
-			QStringRef name;
+			QStringView name;
 			switch (t) {
 			case QXmlStreamReader::StartElement:
 				name = r.name();

tools/updatedvbsi.cpp

@@ -23,9 +23,12 @@
 # define qInfo qDebug
 #endif
 
+#include <QRegularExpression>
+#include <QString>
+
 #include <QDomDocument>
 #include <QFile>
-#include <QRegularExpression>
+
 
 class Element
 {
@@ -206,7 +209,7 @@ void SiXmlParser::parseEntry(QDomNode node, Type type, QTextStream &headerStream
 
 	QString entryName = node.nodeName();
 	QRegularExpression regFuncName("^Dvb|^Atsc");
-	QString initFunctionName = QString(entryName).replace(regFuncName), "init");
+    QString initFunctionName = QString(entryName).replace(regFuncName, "init");
 	bool ignoreFirstNewLine = false;
 
 	QString funcName = entryName + "::";
@@ -257,8 +260,8 @@ void SiXmlParser::parseEntry(QDomNode node, Type type, QTextStream &headerStream
 
 			while (true) {
 				int oldSize = entryLengthCalculation.size();
-				QRegularExpression entryLengthRegEx("at\\(([0-9]*)\\)"), "quint8(data[\\1])");
-				entryLengthCalculation.replace(entryLengthRegEx);
+                QRegularExpression entryLengthRegEx("at\\(([0-9]*)\\)");
+                entryLengthCalculation.replace(entryLengthRegEx, "quint8(data[\\1])");
 
 				if (entryLengthCalculation.size() == oldSize) {
 					break;

tools/updatemimetypes.cpp

@@ -166,7 +166,7 @@ int main(int argc, char *argv[])
 			}
 		}
 
-		QRegularExpression regExp("\\*\\.[a-z0-9+]+");
+        QRegularExpression regExp(QRegularExpression::anchoredPattern("\\*\\.[a-z0-9+]+"));
 
 		for (int i = 0; i < extensions.size(); ++i) {
 			if (extensions.at(i) == "*.anim[1-9j]") {
@@ -187,7 +187,7 @@ int main(int argc, char *argv[])
 				extensions.insert(i, "*.vdr");
 			}
 
-			if (!regExp.exactMatch(extensions.at(i))) {
+            if (!regExp.match(extensions.at(i)).hasMatch()) {
 				qCritical() << "unknown extension syntax" << extensions.at(i);
 				dontUpdate = true;
 			}

tools/updatesource.cpp

@@ -128,9 +128,9 @@ int main(int argc, char *argv[])
 					"is longer than 99 characters";
 			}
 
-			int logIndex = logRegExp.indexIn(line);
-
-			if (logIndex >= 0) {
+            QRegularExpressionMatch match = logRegExp.match(line);
+            if (match.hasMatch()) {
+                int logIndex = match.capturedStart();
 				logIndex = (line.indexOf('"', logIndex) + 1);
 
 				if (!line.mid(logIndex).startsWith(logFunctionName)) {
@@ -153,11 +153,10 @@ int main(int argc, char *argv[])
 
 			if ((bracketLevel == 0) && !line.startsWith('\t')) {
 				QRegularExpression logFunctionRegExp("[0-9A-Za-z:~]*[(]");
-				int index = logFunctionRegExp.indexIn(line);
-
-				if (index >= 0) {
+                QRegularExpressionMatch match = logFunctionRegExp.match(line);
+                if (match.hasMatch()) {
 					logFunctionName =
-						line.mid(index, logFunctionRegExp.matchedLength());
+                        line.mid(match.capturedStart(), match.capturedLength());
 					logFunctionName.chop(1);
 					logFunctionName.append(": ");
 				}