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/Services/InfrastructureManagement/ImportBuildings/ism_import_buildings.cpp
+16 -16
View File
@@ -755,11 +755,11 @@ public:
QString positionString() const { return value(QLatin1String("p")); }
};
static bool parsePositionString(const QStringRef &positionString,
static bool parsePositionString(const QString &positionString,
Core::GeoPosition &pos,
double &rotationDegree)
{
QVector<QStringRef> parts = positionString.split(QLatin1Char(','));
QStringList parts = positionString.split(QLatin1Char(','));
if (parts.size() != 4)
return false;
bool bOk;
@@ -888,7 +888,7 @@ int main(int argc, char **argv)
{
InfrastructureManagement::IsmImportBuildings::ImportData data;
const QString ps = options.positionString();
if (!parsePositionString(QStringRef(&ps), data.geoPos, data.angleDegree))
if (!parsePositionString(ps, data.geoPos, data.angleDegree))
{
ERROR_LOG(app.baseLogger()) << "Error parsing position string! str='" << ps << "'" ;
std::cerr << "Error parsing position string! str='" << ps << "'" << std::endl;
@@ -950,18 +950,18 @@ int main(int argc, char **argv)
}
// xmlFile
data.xmlFileName = parts.at(cfi.idxXmlFile).toString();
data.xmlFileName = parts.at(cfi.idxXmlFile);
// vulnerabilityFile
data.vulFileName = parts.at(cfi.idxVulnerabilityFile).toString();
data.vulFileName = parts.at(cfi.idxVulnerabilityFile);
// position
if (!parsePositionString(parts.at(cfi.idxPosition), data.geoPos, data.angleDegree))
{
ERROR_LOG(app.baseLogger()) << "Can not parse position string of line = '" << line << "'";
std::cerr << "Can not parse position string of line = '" << line << "'" << std::endl;
ERROR_LOG(app.baseLogger()) << "Can not parse position string: '" << parts.at(cfi.idxPosition).toString() << "'";
std::cerr << "Can not parse position string: '" << parts.at(cfi.idxPosition).toString() << "'" << std::endl;
ERROR_LOG(app.baseLogger()) << "Can not parse position string: '" << parts.at(cfi.idxPosition) << "'";
std::cerr << "Can not parse position string: '" << parts.at(cfi.idxPosition) << "'" << std::endl;
return -5;
}
@@ -970,7 +970,7 @@ int main(int argc, char **argv)
//
// egcuToRoomFile
if ((cfi.idxEgcuToRoomFile>=0) && (parts.size() > cfi.idxEgcuToRoomFile))
data.egcuToRoomFileName = parts.at(cfi.idxEgcuToRoomFile).toString();
data.egcuToRoomFileName = parts.at(cfi.idxEgcuToRoomFile);
// externalWlsId
data.externalWlsId = 0;
@@ -979,7 +979,7 @@ int main(int argc, char **argv)
// bauabschnitt
// Normally '-1', but Steve and Iuliana use '0' as default.
data.bauabschnitt = InfrastructureManagement::BuildingGroup::UnknownGroup;
data.bauabschnitt = static_cast<int>(InfrastructureManagement::BuildingGroup::UnknownGroup);
if ((cfi.idxBauabschnitt>=0) && (parts.size() > cfi.idxBauabschnitt))
{
// postprocessing uses ba0 -> 0 , ba1 -> 1 ...
@@ -987,25 +987,25 @@ int main(int argc, char **argv)
const int ba = parts.at(cfi.idxBauabschnitt).toInt();
switch (ba) {
case 0:
data.bauabschnitt = InfrastructureManagement::BuildingGroup::Section0;
data.bauabschnitt = static_cast<int>(InfrastructureManagement::BuildingGroup::Section0);
break;
case 1:
data.bauabschnitt = InfrastructureManagement::BuildingGroup::Section1;
data.bauabschnitt = static_cast<int>(InfrastructureManagement::BuildingGroup::Section1);
break;
case 2:
data.bauabschnitt = InfrastructureManagement::BuildingGroup::Section2;
data.bauabschnitt = static_cast<int>(InfrastructureManagement::BuildingGroup::Section2);
break;
case 3:
data.bauabschnitt = InfrastructureManagement::BuildingGroup::Section3;
data.bauabschnitt = static_cast<int>(InfrastructureManagement::BuildingGroup::Section3);
break;
case 4:
data.bauabschnitt = InfrastructureManagement::BuildingGroup::Section4;
data.bauabschnitt = static_cast<int>(InfrastructureManagement::BuildingGroup::Section4);
break;
case 5:
data.bauabschnitt = InfrastructureManagement::BuildingGroup::Salchau;
data.bauabschnitt = static_cast<int>(InfrastructureManagement::BuildingGroup::Salchau);
break;
default:
data.bauabschnitt = InfrastructureManagement::BuildingGroup::UnknownGroup;
data.bauabschnitt = static_cast<int>(InfrastructureManagement::BuildingGroup::UnknownGroup);
break;
}
}
qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/WebSocketInterface/data_manager.cpp
+6 -6
View File
@@ -52,7 +52,7 @@ int determineFloorNumber(ObjectStructureElement *floor)
return 0;
bool ok = false;
int floorNumber = name.midRef(FLOOR_PATTERN.size()).toInt(&ok);
int floorNumber = name.mid(FLOOR_PATTERN.size()).toInt(&ok);
if (!ok)
return 0;
@@ -233,7 +233,7 @@ DataManager::EinruestEssentials DataManager::getEssentials(const QString &uuid)
mountingPointData.position3d.x = currentElement->getRelativePosition().offsetX;
mountingPointData.position3d.y = currentElement->getRelativePosition().offsetY;
mountingPointData.position3d.z = currentElement->getRelativePosition().offsetZ;
mountingPointData.supportedAssetTypIds.append(currentElement->getData().mountingPointTypeId);
mountingPointData.supportedAssetTypIds.append(static_cast<int>(currentElement->getData().mountingPointTypeId));
mountingPointData.assetId = getMountedAssetId(currentElement->getId());
result.mountingPoints.append(MountingPointMessage(mountingPointData, uuid));
@@ -244,7 +244,7 @@ DataManager::EinruestEssentials DataManager::getEssentials(const QString &uuid)
// No BuildingNetworkSwitch and no AnnouncementUnit (see GUEZE-1548/1459)
AssetTypeMessage::AssetTypeData assetTypeData;
for (int i = MountingPointType::Unknown; i <= static_cast<int>(MountingPointType::EffectGenerationControlUnit); ++i)
for (int i = static_cast<int>(MountingPointType::Unknown); i <= static_cast<int>(MountingPointType::EffectGenerationControlUnit); ++i)
{
if (i == static_cast<int>(MountingPointType::AnnouncementUnit))
continue;
@@ -320,7 +320,7 @@ LtsWebSocket::ReplyMessage *DataManager::getObjectMounting(int plannedMountingId
errorData.errorMessage = QObject::tr("Building id is invalid", "DataManager");
errorData.uuid = uuid;
WARNING_LOG(m_logger) << errorData.errorMessage << " - " << (buildingEle ? buildingEle->getStructureElementTypeId() : -1)
WARNING_LOG(m_logger) << errorData.errorMessage << " - " << (buildingEle ? static_cast<int>(buildingEle->getStructureElementTypeId()) : -1)
<< ", " << plannedMountingId << ", " << objectId;
LtsWebSocket::ReplyMessage *reply = new LtsWebSocket::ErrorMessage(errorData);
return reply;
@@ -831,7 +831,7 @@ LtsWebSocket::ReplyMessage *DataManager::getAssets(const QSet<int> &assetTypeIds
QVector<AssetData> assets;
for (const ObjectInstrumentationAsset *asset : m)
{
if (assetTypeIds.contains(asset->getData().mountingPointTypeId))
if (assetTypeIds.contains(static_cast<int>(asset->getData().mountingPointTypeId)))
assets += assetData(asset);
}
@@ -1196,7 +1196,7 @@ Messages::AssetData DataManager::assetData(const ObjectInstrumentationAsset *ass
}
result.id = asset->getId();
result.assetTypeId = asset->getData().mountingPointTypeId;
result.assetTypeId = static_cast<int>(asset->getData().mountingPointTypeId);
result.assetTag = QString::fromStdString(asset->getData().barcode);
result.designation = QString::fromStdString(asset->getData().name);
result.hostname = QString::fromStdString(asset->getData().hostname);
qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_main_structure_element.cpp
+8 -3
View File
@@ -94,8 +94,13 @@ bool HandlerMainStructureElement::init()
}
// add structure elements to global map for lookup (e.g. in 'add Footprints to MSE objects')
// Qt6: QMap::unite removed -> merge manually (unite semantics: overwrite existing keys)
for (ObjectMainStructureElement *objMse : std::as_const(m_objectMainStructureElementMap))
m_objectStructureElementMap.unite(objMse->getStructureElements());
{
const auto &seMap = objMse->getStructureElements();
for (auto it = seMap.constBegin(); it != seMap.constEnd(); ++it)
m_objectStructureElementMap.insert(it.key(), it.value());
}
// add Footprints to MSE objects
// read all FP from database
@@ -656,14 +661,14 @@ void HandlerMainStructureElement::udpatePropertiesForRelayOverride(const int rel
continue;
if (state != InfrastructureManagement::EffectOverride::Automatic)
arrRelays[i] = QJsonObject({qMakePair<QString, QJsonValue>(keyStr, static_cast<int>(state))});
arrRelays[i] = QJsonObject({QPair<QString, QJsonValue>(keyStr, static_cast<int>(state))});
else
arrRelays.removeAt(i);
containsRelay = true;
break;
}
if (!containsRelay && state != InfrastructureManagement::EffectOverride::Automatic)
arrRelays.append(QJsonObject({qMakePair<QString, QJsonValue>(QString::number(relay), static_cast<int>(state))}));
arrRelays.append(QJsonObject({QPair<QString, QJsonValue>(QString::number(relay), static_cast<int>(state))}));
if (arrRelays.isEmpty())
overridesObj.remove(QStringLiteral("relays"));
qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_main_schedule.cpp
+3 -3
View File
@@ -290,15 +290,15 @@ Database::IsmMountingPointSchedule ObjectMainSchedule::toDbData(const MainSchedu
dbData.name = QString::fromStdString(ddsData.name);
dbData.timeCreated = QDateTime::fromMSecsSinceEpoch(ddsData.timeCreated);
dbData.statusId = ddsData.statusId;
if (ddsData.timeStart.is_set() && ddsData.timeStart.get() > 0)
if (ddsData.timeStart.has_value() && ddsData.timeStart.get() > 0)
dbData.timeStart = QDateTime::fromMSecsSinceEpoch(ddsData.timeStart.get());
else
dbData.timeStart = QDateTime();
if (ddsData.timeEnd.is_set() && ddsData.timeEnd.get() > 0)
if (ddsData.timeEnd.has_value() && ddsData.timeEnd.get() > 0)
dbData.timeEnd = QDateTime::fromMSecsSinceEpoch(ddsData.timeEnd.get());
else
dbData.timeEnd = QDateTime();
if (ddsData.exerciseId.is_set() && ddsData.exerciseId.get() > 0)
if (ddsData.exerciseId.has_value() && ddsData.exerciseId.get() > 0)
dbData.exerciseId = ddsData.exerciseId.get();
return dbData;
qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_main_structure_element.cpp
+2 -2
View File
@@ -229,7 +229,7 @@ Core::FunctionReplyObject ObjectMainStructureElement::createObject(const MainStr
m_footprint.id = m_data.id; // = buildingId, important for remove etc.
m_footprint.structureElementId = objStructureElementBuilding->getId();
m_footprint.name = m_data.name; // footprint name = building name
if (request.footprint.is_set())
if (request.footprint.has_value())
{
const auto &fp = request.footprint.get();
for (size_t i = 0; i < fp.size(); ++i)
@@ -358,7 +358,7 @@ Core::FunctionReplyObject ObjectMainStructureElement::updateObject(const MainStr
MainFootprint mfData(m_footprint);
bool bUpdateFootprintNeeded = false;
if (request.footprint.is_set())
if (request.footprint.has_value())
{
const auto &fpReq = request.footprint.get();
bUpdateFootprintNeeded = fpReq.size() != mfData.elements.size();
qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/schedule_status_manager.cpp
+2 -2
View File
@@ -58,7 +58,7 @@ namespace InfrastructureManagement
QString ScheduleStatusManager::toString(InfrastructureManagement::ScheduleStatus state)
{
switch (state.underlying())
switch (state)
{
case ScheduleStatus::Unknown:
return tr("UNKNOWN");
@@ -74,7 +74,7 @@ namespace InfrastructureManagement
return tr("REMOVED");
}
return tr("Unknown State: (%1)").arg(state.underlying());
return tr("Unknown State: (%1)").arg(state);
}
void ScheduleStatusManager::setStateInternal(InfrastructureManagement::ScheduleStatus state)