lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set

Browse Source 
new_docker_build.sh gains Group 12 (212 GUI/Data plugins); fixes LtsUtilsGuiDds visibility (LTO-stripped exports), LtsProjectionWorkstation unity name shadow, 6 unity-off dirs (dup file-scope statics, ddsftc INTERFACE sources) and reconfigures BUILD_FILTERMANAGEMENT/BUILD_PLUGINS_SERVICEMONITOR=ON
This commit is contained in:
berrux-dev committed 2026-10-20 09:36:57 +02:00
1 parent 2b957d1edb
commit 598fc2560e
1718 files changed
+126739 -18495
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Data/tln_data_plugin.cpp
+17 -17
View File
@@ -29,7 +29,7 @@ std::shared_ptr<DataPluginBase::Interface> DataPlugin::createDataInterface(LtsSe
DataInterfaceImpl::DataInterfaceImpl(LtsSession::LtsSessionDataDds *session)
: DataInterface()
, m_foreign(std::make_shared<ForeignInterfaceImpl>(session))
.getNGLLogger("Plugins.Timeline.Data"))
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
{}
ForeignInterfaceImpl::ForeignInterfaceImpl(LtsSession::LtsSessionDataDds *session)
@@ -37,7 +37,7 @@ ForeignInterfaceImpl::ForeignInterfaceImpl(LtsSession::LtsSessionDataDds *sessio
, m_webSocketScm(nullptr)
, m_webSocketEem(nullptr)
, m_liveHistoryBufferTimer(new QTimer(this))
.getNGLLogger("Plugins.Timeline.Data"))
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
{
connect(m_liveHistoryBufferTimer, &QTimer::timeout, this, &ForeignInterfaceImpl::onClearHistoryBuffer);
m_liveHistoryBufferTimer->setInterval(5000);
@@ -58,17 +58,17 @@ ForeignInterfaceImpl::~ForeignInterfaceImpl()
static ExerciseEventManagement::Event db2dds(const ExerciseEventManagement::Database::EemEvent &evDb)
{
ExerciseEventManagement::Event ev;
ev.id(evDb.id & 0xffffffff);
ev.sampleTime(evDb.sampleTime);
ev.eventTypeId(evDb.eventTypeId);
ev.participantId(evDb.participantId);
ev.partyId(evDb.partyId);
ev.equipmentNumber(evDb.equipmentNumber);
ev.properties(evDb.properties.toUtf8().data());
ev.id = evDb.id & 0xffffffff;
ev.sampleTime = evDb.sampleTime;
ev.eventTypeId = evDb.eventTypeId;
ev.participantId = evDb.participantId;
ev.partyId = evDb.partyId;
ev.equipmentNumber = evDb.equipmentNumber;
ev.properties = evDb.properties.toUtf8().data();
if ( ev.eventTypeId() == ProjectDataManagement::PdmEventType::EventType_HitBuilding)
if ( ev.eventTypeId == ProjectDataManagement::PdmEventType::EventType_HitBuilding)
{
QJsonObject properties = QJsonDocument::fromJson(QString::fromStdString(ev.properties()).toUtf8()).object();
QJsonObject properties = QJsonDocument::fromJson(QString::fromStdString(ev.properties).toUtf8()).object();
if ( properties.contains(QStringLiteral("AesName")))
{
@@ -76,7 +76,7 @@ static ExerciseEventManagement::Event db2dds(const ExerciseEventManagement::Data
} else if ( properties.contains(QStringLiteral("OriginatorEquipmentNumber")))
{
QJsonParseError parseError;
QJsonDocument doc = QJsonDocument::fromJson(QByteArray::fromStdString(ev.properties()), &parseError);
QJsonDocument doc = QJsonDocument::fromJson(QByteArray::fromStdString(ev.properties), &parseError);
long originatorEquipmentNumber = properties.value(QStringLiteral("OriginatorEquipmentNumber")).toInt();
QString originatorEquipmentNumberStr = QString::number(originatorEquipmentNumber);
@@ -85,9 +85,9 @@ static ExerciseEventManagement::Event db2dds(const ExerciseEventManagement::Data
QJsonDocument doc(properties);
std::string propertiesStd = QJsonDocument(properties).toJson(QJsonDocument::Compact).toStdString();
ev.properties(propertiesStd);
ev.properties = propertiesStd;
}
ev.position(Core::GeoPosition(evDb.position.x(), evDb.position.y(), evDb.position.z()));
ev.position = Core::GeoPosition(evDb.position.x(), evDb.position.y(), evDb.position.z());
return ev;
}
@@ -101,7 +101,7 @@ TimelineDataProvider::TimelineDataProvider(int requestId, const QUrl &url,
, m_bFinshed(false)
, m_requestMin(from)
, m_requestMax(to)
.getNGLLogger("Plugins.Timeline.Data"))
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
{
connect(m_webSocketEem, &QWebSocket::disconnected,
this, &TimelineDataProvider::disconnectedFromEem);
@@ -247,7 +247,7 @@ void ForeignInterfaceImpl::textMessageFromScm(const QString &message)
{
const QJsonObject &port = valPort.toObject();
int typeId = port.value(QStringLiteral("typeId")).toInt();
if (typeId == Core::CorePortType::WebSocketServer)
if (typeId == static_cast<int>(Core::CorePortType::WebSocketServer))
{
m_eemPort = port.value(QStringLiteral("number")).toInt();
connectToEem();
@@ -295,7 +295,7 @@ void ForeignInterfaceImpl::textMessageFromEem(const QString &message)
using namespace ExerciseEventManagement::Database;
ExerciseEventManagement::Event ev(db2dds(fromJson<EemEvent>(obj)));
emit liveEvent(ev);
m_liveHistoryBuffer[ev.sampleTime() / 1000].push_back(std::move(ev));
m_liveHistoryBuffer[ev.sampleTime / 1000].push_back(std::move(ev));
}
void ForeignInterfaceImpl::requestFinished()