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;
}
}