Merge feature/qt6-migration-basis-modules-merge-viewer-validation into feature/migrate-lts-projects-and-application

Cherry-picks 5501d1e50 (stub-header updates, superseded by 4223ca2ff relocation); resolves 1 content + 24 modify/delete conflicts; validates BUILD_RTI=ON BUILD_GRANTLEE=ON incl. Tools Groups 6-11.
This commit is contained in:
berrux-dev committed 2026-09-28 01:05:39 +02:00
commit 593c221d23
1295 files changed
+22136 -20217

No files matched your search

@@ -12,22 +12,20 @@
#include <QString>
#include <QStringList>
#include <QDebug>
#include <QRandomGenerator>
Server::Server()
: QObject(nullptr)
, m_server(new QWebSocketServer(QString(), QWebSocketServer::NonSecureMode, this))
{
qsrand(time(nullptr));
QRandomGenerator::global()->seed();
}
qint64 randomBetween(qint64 min, qint64 max)
{
qint64 val = qrand(); // qrand returns int (32 bit)
val <<= 32;
val |= qrand();
return val % (max - min) + min;
return QRandomGenerator::global()->bounded(min, max);
}
@@ -156,7 +154,7 @@ bool Server::init(quint16 port)
if (!k)
limit = -1;
QStringList typesStringList(typesString.split(QLatin1Char(','), QString::SkipEmptyParts));
QStringList typesStringList(typesString.split(QLatin1Char(','), Qt::SkipEmptyParts));
qWarning() << "new request" << from << to << typesString << "limit" << limit;
@@ -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(QRegExp(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(QRegExp(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).isEmpty())
continue;
const QString removeUrl = buildHttpPrefix() + QLatin1String("/axis-cgi/admin/param.cgi?action=remove&group=") +
@@ -133,7 +133,7 @@ int HTTPRequestHandler::getAmount(const QString &groupName, QNetworkAccessManage
QByteArray replyBytes = reply->readAll();
QString bytesString = QString::fromUtf8(replyBytes.data(), replyBytes.size());
QString replyText = QVariant(bytesString).toString();
QStringList replyList = replyText.split(QRegExp(QLatin1String("\n|\r\n|\r")));
QStringList replyList = replyText.split(QRegularExpression(QLatin1String("\n|\r\n|\r")));
reply->deleteLater();
return replyList.count() - 1;
}
@@ -113,16 +113,16 @@ void VulnerabilityStateGenerator::MainHandler::setNewState()
void VulnerabilityStateGenerator::MainHandler::fillMapFromEnum()
{
m_vsMap.insert(0, ProjectDataManagement::VulnerabilityState_def::CombatReady);
m_vsMap.insert(1, ProjectDataManagement::VulnerabilityState_def::LightDamage);
m_vsMap.insert(2, ProjectDataManagement::VulnerabilityState_def::MediumDamage);
m_vsMap.insert(3, ProjectDataManagement::VulnerabilityState_def::HeavyDamage);
m_vsMap.insert(4, ProjectDataManagement::VulnerabilityState_def::MobilityKill);
m_vsMap.insert(5, ProjectDataManagement::VulnerabilityState_def::VisibleMobilityKill);
m_vsMap.insert(6, ProjectDataManagement::VulnerabilityState_def::WeaponSystemDamage);
m_vsMap.insert(7, ProjectDataManagement::VulnerabilityState_def::VisibleWeaponSystemDamage);
m_vsMap.insert(8, ProjectDataManagement::VulnerabilityState_def::CatastrophicKill);
m_vsMap.insert(9, ProjectDataManagement::VulnerabilityState_def::TemporarySeverance);
m_vsMap.insert(10, ProjectDataManagement::VulnerabilityState_def::NearMiss);
m_vsMap.insert(11, ProjectDataManagement::VulnerabilityState_def::HitWithNoEffect);
m_vsMap.insert(0, ProjectDataManagement::VulnerabilityState::CombatReady);
m_vsMap.insert(1, ProjectDataManagement::VulnerabilityState::LightDamage);
m_vsMap.insert(2, ProjectDataManagement::VulnerabilityState::MediumDamage);
m_vsMap.insert(3, ProjectDataManagement::VulnerabilityState::HeavyDamage);
m_vsMap.insert(4, ProjectDataManagement::VulnerabilityState::MobilityKill);
m_vsMap.insert(5, ProjectDataManagement::VulnerabilityState::VisibleMobilityKill);
m_vsMap.insert(6, ProjectDataManagement::VulnerabilityState::WeaponSystemDamage);
m_vsMap.insert(7, ProjectDataManagement::VulnerabilityState::VisibleWeaponSystemDamage);
m_vsMap.insert(8, ProjectDataManagement::VulnerabilityState::CatastrophicKill);
m_vsMap.insert(9, ProjectDataManagement::VulnerabilityState::TemporarySeverance);
m_vsMap.insert(10, ProjectDataManagement::VulnerabilityState::NearMiss);
m_vsMap.insert(11, ProjectDataManagement::VulnerabilityState::HitWithNoEffect);
}
@@ -53,7 +53,7 @@ void VulnerabilityStateGenerator::ProxyEmulator::giveInitState(const QMap<qint32
state.m_equipmentNumber(currentParticipant.m_equipmentNumber().get());
state.sampleTime(QDateTime::currentMSecsSinceEpoch());
state.vulnerabilityState(ProjectDataManagement::VulnerabilityState_def::CombatReady);
state.vulnerabilityState(ProjectDataManagement::VulnerabilityState::CombatReady);
m_tabDts->publish(state);
}