Merge feature/qt6-migration-basis-modules-merge-viewer-validation into feature/migrate-lts-projects-and-application
Cherry-picks5501d1e50(stub-header updates, superseded by4223ca2ffrelocation); resolves 1 content + 24 modify/delete conflicts; validates BUILD_RTI=ON BUILD_GRANTLEE=ON incl. Tools Groups 6-11.
This commit is contained in:
1295 files changed
+22136
-20217
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
|
||||
|
||||
|
||||
+1
-1
@@ -97,8 +97,8 @@ int SearchParameters::numberOfParameter() const
|
||||
|
||||
SymbolDictionary::SymbolDictionary(QObject *parent)
|
||||
: QObject(parent)
|
||||
, m_logger(getLogger("SymbolDictionary"))
|
||||
{
|
||||
LOGGER_T m_logger = getLogger("SymbolDictionary");
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
|
||||
|
||||
initResource();
|
||||
|
||||
Reference in new issue
Block a user