Merge feature/qt6-migration-basis-modules-services into feature/qt6-migration-basis-modules
Resolves 17 conflicts against legacy Qt5 semantics; validates with BUILD_RTI=ON BUILD_GRANTLEE=ON.
This commit is contained in:
1200 files changed
+20421
-18259
No files matched your search
+7
-7
@@ -27,19 +27,19 @@ AdvancedSymbology::Role roleToRole(const PARTICIPANT_ROLE_TYPE role)
|
||||
{
|
||||
switch (role.underlying())
|
||||
{
|
||||
case ParticipantManagement::Role_def::Unknown:
|
||||
case ParticipantManagement::Role::Unknown:
|
||||
return AdvancedSymbology::Role::Unknown;
|
||||
case ParticipantManagement::Role_def::Friend:
|
||||
case ParticipantManagement::Role::Friend:
|
||||
return AdvancedSymbology::Role::Friend;
|
||||
case ParticipantManagement::Role_def::Neutral:
|
||||
case ParticipantManagement::Role::Neutral:
|
||||
return AdvancedSymbology::Role::Neutral;
|
||||
case ParticipantManagement::Role_def::Enemy:
|
||||
case ParticipantManagement::Role::Enemy:
|
||||
return AdvancedSymbology::Role::HostileFaker;
|
||||
case ParticipantManagement::Role_def::Pending:
|
||||
case ParticipantManagement::Role::Pending:
|
||||
return AdvancedSymbology::Role::Pending;
|
||||
case ParticipantManagement::Role_def::AssumedFriend:
|
||||
case ParticipantManagement::Role::AssumedFriend:
|
||||
return AdvancedSymbology::Role::AssumedFriend;
|
||||
case ParticipantManagement::Role_def::Suspect:
|
||||
case ParticipantManagement::Role::Suspect:
|
||||
return AdvancedSymbology::Role::SuspectJoker;
|
||||
} // switch
|
||||
|
||||
|
||||
Reference in new issue
Block a user