Qt6 migration fixes: RTI DDS alias targets, ErrorMessage namespace, DDS header include path

This commit is contained in:
torsten committed 2026-08-27 09:02:26 +02:00
1 parent 8050bca545
commit bb1447c858
18635 files changed
+2466913 -906310

No files matched your search

@@ -12,7 +12,7 @@
#include <QEventLoop>
#include <QNetworkAccessManager>
#include <QNetworkReply>
#include <QRegularExpression>
#include <QtCore/QRegularExpression>
using namespace VapixConfig;
HTTPRequestHandler::HTTPRequestHandler()
@@ -65,9 +65,9 @@ QVector<QMap<QString, QString>> HTTPRequestHandler::getParams(const QString &gro
QByteArray replyBytes = reply->readAll();
QString replyText = QString::fromUtf8(replyBytes.data(), replyBytes.size());
QRegularExpression re(QLatin1String("(\\w++=[^_]++)"));
const QVector<QStringRef> replyList = replyText.splitRef(QRegularExpression(QLatin1String("\n|\r\n|\r")));
const QStringList replyList = replyText.split(QRegularExpression(QLatin1String("\n|\r\n|\r")));
QMap<QString, QString> paramMap;
for (const QStringRef &string : replyList)
for (const QString &string : replyList)
{
QRegularExpressionMatch match = re.match(string, 0, QRegularExpression::PartialPreferCompleteMatch);
if (!match.captured(0).isNull())
@@ -92,12 +92,12 @@ void HTTPRequestHandler::removeParams(const QString &groupName, QNetworkAccessMa
QByteArray replyBytes = reply->readAll();
QString replyText = QString::fromUtf8(replyBytes.data(), replyBytes.size());
QRegularExpression re(QLatin1String("(\\b\\w{2}\\b)"));
const QVector<QStringRef> replyList = replyText.splitRef(QRegularExpression(QLatin1String("\n|\r\n|\r")));
const QStringList replyList = replyText.split(QRegularExpression(QLatin1String("\n|\r\n|\r")));
QStringList tempList;
for (const QStringRef &string : replyList)
for (const QString &string : replyList)
{
QRegularExpressionMatch match = re.match(string, 0, QRegularExpression::NormalMatch);
if (match.capturedRef(0).isNull())
if (match.captured(0).isNull())
continue;
const QString removeUrl = buildHttpPrefix() + QLatin1String("/axis-cgi/admin/param.cgi?action=remove&group=") +
@@ -105,7 +105,7 @@ void HTTPRequestHandler::removeParams(const QString &groupName, QNetworkAccessMa
tempList.append(removeUrl);
}
tempList.removeDuplicates();
for (const QString &string : qAsConst(tempList))
for (const QString &string : tempList)
{
QUrl url;
url.setUrl(string);