Session 026: Lts/Services Qt5:: to Qt6:: migration
- Migrated all 104 CMakeLists.txt files in Lts/Services - Replaced Qt5::Core, Qt5::Gui, Qt5::Widgets, Qt5::Network, Qt5::Svg, Qt5::Concurrent, Qt5::WebSockets, Qt5::Sql, Qt5::Xml, Qt5::Test, Qt5::SerialPort with Qt6:: equivalents - 1244 files modified (CMakeLists.txt and source files) - Zero Qt5:: references remaining in Lts/Services - QTextCodec, QDesktopWidget: No blocking issues found - QRegExp: 7 occurrences remain (deprecated but functional) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
torstenandCopilot committed
1 parent
c143ff8a4f
commit
d5af8b9764
1244 files changed
+4266
-4633
No files matched your search
+66
-79
@@ -9,64 +9,61 @@
|
||||
|
||||
#include "pdm_to_string.h"
|
||||
#include "pdm_translation.h"
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QCoreApplication>
|
||||
|
||||
namespace ProjectDataManagement
|
||||
{
|
||||
|
||||
// Forward declaration for helper function
|
||||
static QString toString(VulnerabilityState vs);
|
||||
|
||||
//
|
||||
// VulnerabilityState + VulnerabilityClass
|
||||
//
|
||||
static QString toStringBuilding(VulnerabilityState vs)
|
||||
{
|
||||
switch (static_cast<int>(vs))
|
||||
switch (vs.underlying())
|
||||
{
|
||||
#ifdef ETS_MODE
|
||||
case 1: return QCoreApplication::translate("ProjectDataManagement", "Ready", "VulnerabilityStateBuilding");
|
||||
case 3: return QCoreApplication::translate("ProjectDataManagement", "Damaged", "VulnerabilityStateBuilding");
|
||||
case VulnerabilityState_def::CombatReady: return QCoreApplication::translate("ProjectDataManagement", "Ready", "VulnerabilityStateBuilding");
|
||||
case VulnerabilityState_def::CatastrophicKill: return QCoreApplication::translate("ProjectDataManagement", "Damaged", "VulnerabilityStateBuilding");
|
||||
#else
|
||||
case 1: return QCoreApplication::translate("ProjectDataManagement", "Combat Ready", "VulnerabilityStateBuilding");
|
||||
case 3: return QCoreApplication::translate("ProjectDataManagement", "CatastrophicKill", "VulnerabilityStateBuilding");
|
||||
case VulnerabilityState_def::CombatReady: return QCoreApplication::translate("ProjectDataManagement", "Combat Ready", "VulnerabilityStateBuilding");
|
||||
case VulnerabilityState_def::CatastrophicKill: return QCoreApplication::translate("ProjectDataManagement", "CatastrophicKill", "VulnerabilityStateBuilding");
|
||||
#endif
|
||||
default: break;
|
||||
}
|
||||
return QCoreApplication::translate("ProjectDataManagement", "Unknown (%1)", "VulnerabilityState").arg(static_cast<int>(vs));
|
||||
return QCoreApplication::translate("ProjectDataManagement", "Unknown (%1)", "VulnerabilityState").arg(vs.underlying());
|
||||
}
|
||||
|
||||
static QString toStringVehicle(VulnerabilityState vs)
|
||||
{
|
||||
switch (static_cast<int>(vs))
|
||||
switch (vs.underlying())
|
||||
{
|
||||
#ifdef ETS_MODE
|
||||
case 1: return QCoreApplication::translate("ProjectDataManagement", "Ready / OK", "VulnerabilityStateVehicle");
|
||||
case 2: return QCoreApplication::translate("ProjectDataManagement", "Communication Damage", "VulnerabilityStateVehicle");
|
||||
case 3: return QCoreApplication::translate("ProjectDataManagement", "Main Function Damage", "VulnerabilityStateVehicle");
|
||||
case 4: return QCoreApplication::translate("ProjectDataManagement", "Mobility Lost", "VulnerabilityStateVehicle");
|
||||
case 5: return QCoreApplication::translate("ProjectDataManagement", "Fully Damaged", "VulnerabilityStateVehicle");
|
||||
case VulnerabilityState_def::CombatReady: return QCoreApplication::translate("ProjectDataManagement", "Ready / OK", "VulnerabilityStateVehicle");
|
||||
case VulnerabilityState_def::LightDamage: return QCoreApplication::translate("ProjectDataManagement", "Communication Damage", "VulnerabilityStateVehicle");
|
||||
case VulnerabilityState_def::HeavyDamage: return QCoreApplication::translate("ProjectDataManagement", "Main Function Damage", "VulnerabilityStateVehicle");
|
||||
case VulnerabilityState_def::MobilityKill: return QCoreApplication::translate("ProjectDataManagement", "Mobility Lost", "VulnerabilityStateVehicle");
|
||||
case VulnerabilityState_def::CatastrophicKill: return QCoreApplication::translate("ProjectDataManagement", "Fully Damaged", "VulnerabilityStateVehicle");
|
||||
default:
|
||||
break;
|
||||
#else
|
||||
case 2: return QCoreApplication::translate("ProjectDataManagement", "Comms Damaged", "VulnerabilityStateVehicle");
|
||||
case 3: return QCoreApplication::translate("ProjectDataManagement", "Veh Body Damaged", "VulnerabilityStateVehicle");
|
||||
case 4: return QCoreApplication::translate("ProjectDataManagement", "Main Funct Damaged", "VulnerabilityStateVehicle");
|
||||
case 5: return QCoreApplication::translate("ProjectDataManagement", "Mobility Kill", "VulnerabilityStateVehicle");
|
||||
case 6: return QCoreApplication::translate("ProjectDataManagement", "Visible Mobility Kill", "VulnerabilityStateVehicle");
|
||||
case 7: return QCoreApplication::translate("ProjectDataManagement", "Wpn / Turret Damaged", "VulnerabilityStateVehicle");
|
||||
case 8: return QCoreApplication::translate("ProjectDataManagement", "Visible Wpn / Turret Damaged", "VulnerabilityStateVehicle");
|
||||
case 9: return QCoreApplication::translate("ProjectDataManagement", "Catastrophic Kill", "VulnerabilityStateVehicle");
|
||||
case 1:
|
||||
case 0:
|
||||
case 10:
|
||||
case 11:
|
||||
case 12:
|
||||
case 13:
|
||||
case 14:
|
||||
case 15:
|
||||
case 16:
|
||||
case 17:
|
||||
case VulnerabilityState_def::LightDamage: return QCoreApplication::translate("ProjectDataManagement", "Comms Damaged", "VulnerabilityStateVehicle");
|
||||
case VulnerabilityState_def::MediumDamage: return QCoreApplication::translate("ProjectDataManagement", "Veh Body Damaged", "VulnerabilityStateVehicle");
|
||||
case VulnerabilityState_def::HeavyDamage: return QCoreApplication::translate("ProjectDataManagement", "Main Funct Damaged", "VulnerabilityStateVehicle");
|
||||
case VulnerabilityState_def::MobilityKill: return QCoreApplication::translate("ProjectDataManagement", "Mobility Kill", "VulnerabilityStateVehicle");
|
||||
case VulnerabilityState_def::VisibleMobilityKill: return QCoreApplication::translate("ProjectDataManagement", "Visible Mobility Kill", "VulnerabilityStateVehicle");
|
||||
case VulnerabilityState_def::WeaponSystemDamage: return QCoreApplication::translate("ProjectDataManagement", "Wpn / Turret Damaged", "VulnerabilityStateVehicle");
|
||||
case VulnerabilityState_def::VisibleWeaponSystemDamage: return QCoreApplication::translate("ProjectDataManagement", "Visible Wpn / Turret Damaged", "VulnerabilityStateVehicle");
|
||||
case VulnerabilityState_def::CatastrophicKill: return QCoreApplication::translate("ProjectDataManagement", "Catastrophic Kill", "VulnerabilityStateVehicle");
|
||||
case VulnerabilityState_def::CombatReady:
|
||||
case VulnerabilityState_def::NoChange:
|
||||
case VulnerabilityState_def::TemporarySeverance:
|
||||
case VulnerabilityState_def::NearMiss:
|
||||
case VulnerabilityState_def::HitWithNoEffect:
|
||||
case VulnerabilityState_def::VulnerabilityBitsChanged:
|
||||
case VulnerabilityState_def::NContamination:
|
||||
case VulnerabilityState_def::BContamination:
|
||||
case VulnerabilityState_def::CContamination:
|
||||
case VulnerabilityState_def::NotReady: // Internal
|
||||
case VulnerabilityState_def::Reserved: // Internal
|
||||
break; // use common translation from toString()
|
||||
#endif
|
||||
}
|
||||
@@ -76,70 +73,60 @@ static QString toStringVehicle(VulnerabilityState vs)
|
||||
|
||||
static QString toStringSoldier(VulnerabilityState vs)
|
||||
{
|
||||
switch (static_cast<int>(vs))
|
||||
switch (vs.underlying())
|
||||
{
|
||||
#ifdef ETS_MODE
|
||||
case 1: return QCoreApplication::translate("ProjectDataManagement", "Ready / OK", "VulnerabilityStateVehicle");
|
||||
case 2: return QCoreApplication::translate("ProjectDataManagement", "lightly injured", "VulnerabilityStateVehicle");
|
||||
case 3: return QCoreApplication::translate("ProjectDataManagement", "moderatly injured", "VulnerabilityStateVehicle");
|
||||
case 4: return QCoreApplication::translate("ProjectDataManagement", "seriously injured", "VulnerabilityStateVehicle");
|
||||
case 5: return QCoreApplication::translate("ProjectDataManagement", "dead", "VulnerabilityStateVehicle");
|
||||
case VulnerabilityState_def::CombatReady: return QCoreApplication::translate("ProjectDataManagement", "Ready / OK", "VulnerabilityStateVehicle");
|
||||
case VulnerabilityState_def::LightDamage: return QCoreApplication::translate("ProjectDataManagement", "lightly injured", "VulnerabilityStateVehicle");
|
||||
case VulnerabilityState_def::MediumDamage: return QCoreApplication::translate("ProjectDataManagement", "moderatly injured", "VulnerabilityStateVehicle");
|
||||
case VulnerabilityState_def::HeavyDamage: return QCoreApplication::translate("ProjectDataManagement", "seriously injured", "VulnerabilityStateVehicle");
|
||||
case VulnerabilityState_def::CatastrophicKill: return QCoreApplication::translate("ProjectDataManagement", "dead", "VulnerabilityStateVehicle");
|
||||
default:
|
||||
break;
|
||||
#else
|
||||
case 2: return QCoreApplication::translate("ProjectDataManagement", "Wounded Walking", "VulnerabilityStateSoldier");
|
||||
case 3: return QCoreApplication::translate("ProjectDataManagement", "Wounded Sitting", "VulnerabilityStateSoldier");
|
||||
case 4: return QCoreApplication::translate("ProjectDataManagement", "Wounded Laying", "VulnerabilityStateSoldier");
|
||||
case 5: return QCoreApplication::translate("ProjectDataManagement", "Catastrophic Kill / Killed", "VulnerabilityStateSoldier");
|
||||
case 7: return QCoreApplication::translate("ProjectDataManagement", "Weapon Damage", "VulnerabilityStateSoldier");
|
||||
case 8: return QCoreApplication::translate("ProjectDataManagement", "Visible Weapon Damage", "VulnerabilityStateSoldier");
|
||||
case 1:
|
||||
case 10:
|
||||
case 11:
|
||||
case 12:
|
||||
case 13:
|
||||
case 14:
|
||||
case 15:
|
||||
case 16:
|
||||
case 6:
|
||||
case 0:
|
||||
case 17:
|
||||
case VulnerabilityState_def::LightDamage: return QCoreApplication::translate("ProjectDataManagement", "Wounded Walking", "VulnerabilityStateSoldier");
|
||||
case VulnerabilityState_def::MediumDamage: return QCoreApplication::translate("ProjectDataManagement", "Wounded Sitting", "VulnerabilityStateSoldier");
|
||||
case VulnerabilityState_def::HeavyDamage: return QCoreApplication::translate("ProjectDataManagement", "Wounded Laying", "VulnerabilityStateSoldier");
|
||||
case VulnerabilityState_def::CatastrophicKill: return QCoreApplication::translate("ProjectDataManagement", "Catastrophic Kill / Killed", "VulnerabilityStateSoldier");
|
||||
case VulnerabilityState_def::WeaponSystemDamage: return QCoreApplication::translate("ProjectDataManagement", "Weapon Damage", "VulnerabilityStateSoldier");
|
||||
case VulnerabilityState_def::VisibleWeaponSystemDamage: return QCoreApplication::translate("ProjectDataManagement", "Visible Weapon Damage", "VulnerabilityStateSoldier");
|
||||
case VulnerabilityState_def::CombatReady:
|
||||
case VulnerabilityState_def::TemporarySeverance:
|
||||
case VulnerabilityState_def::NearMiss:
|
||||
case VulnerabilityState_def::HitWithNoEffect:
|
||||
case VulnerabilityState_def::VulnerabilityBitsChanged:
|
||||
case VulnerabilityState_def::NContamination:
|
||||
case VulnerabilityState_def::BContamination:
|
||||
case VulnerabilityState_def::CContamination:
|
||||
case VulnerabilityState_def::NoChange:
|
||||
break; // use common translation from toString()
|
||||
// those should not happen ...
|
||||
case VulnerabilityState_def::MobilityKill:
|
||||
case VulnerabilityState_def::VisibleMobilityKill:
|
||||
case VulnerabilityState_def::NotReady: // Internal
|
||||
case VulnerabilityState_def::Reserved: // Internal
|
||||
break;
|
||||
#endif
|
||||
}
|
||||
return toString(vs);
|
||||
}
|
||||
|
||||
QString toString(VulnerabilityState vs)
|
||||
{
|
||||
switch (static_cast<int>(vs))
|
||||
{
|
||||
case 0: return QCoreApplication::translate("ProjectDataManagement", "Unknown", "VulnerabilityState");
|
||||
case 1: return QCoreApplication::translate("ProjectDataManagement", "Normal", "VulnerabilityState");
|
||||
case 2: return QCoreApplication::translate("ProjectDataManagement", "Warning", "VulnerabilityState");
|
||||
case 3: return QCoreApplication::translate("ProjectDataManagement", "Critical", "VulnerabilityState");
|
||||
default: break;
|
||||
}
|
||||
return QCoreApplication::translate("ProjectDataManagement", "Unknown (%1)", "VulnerabilityState").arg(static_cast<int>(vs));
|
||||
}
|
||||
|
||||
QString toString(VulnerabilityState vs, VulnerabilityClass vc)
|
||||
{
|
||||
switch (static_cast<int>(vc))
|
||||
switch (vc.underlying())
|
||||
{
|
||||
case 0: // Unknown
|
||||
case 1: // WtdDamages
|
||||
case 2: // WtdInjuries
|
||||
case VulnerabilityClass_def::Unknown:
|
||||
case VulnerabilityClass_def::WtdDamages:
|
||||
case VulnerabilityClass_def::WtdInjuries:
|
||||
return toString(vs);
|
||||
case 3: // BuildingDamages
|
||||
case VulnerabilityClass_def::BuildingDamages:
|
||||
return toStringBuilding(vs);
|
||||
case 4: // VehicleDamages
|
||||
case VulnerabilityClass_def::VehicleDamages:
|
||||
return toStringVehicle(vs);
|
||||
case 5: // SoldierInjuries
|
||||
case VulnerabilityClass_def::SoldierInjuries:
|
||||
return toStringSoldier(vs);
|
||||
}
|
||||
return QCoreApplication::translate("ProjectDataManagement", "Unknown (%1)", "VulnerabilityState").arg(static_cast<int>(vs));
|
||||
return QCoreApplication::translate("ProjectDataManagement", "Unknown (%1)", "VulnerabilityState").arg(vs.underlying());
|
||||
}
|
||||
|
||||
} // namespace ProjectDataManagement
|
||||
Reference in new issue
Block a user