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
-1
@@ -60,7 +60,6 @@ public:
|
||||
const std::shared_ptr<AdvancedSymbology::ForeignDataInterface> &asbIfc);
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
void retranslate() override;
|
||||
bool apply() override;
|
||||
void showIsSimulated();
|
||||
|
||||
+2
-2
@@ -375,9 +375,9 @@ bool ParticipantPoolModel::isValidTypeClass(int typeId) const
|
||||
const TypeClass tc = m_dtc->type(typeId).typeClass();
|
||||
switch (tc.underlying())
|
||||
{
|
||||
case TypeClass_def::Unit:
|
||||
case TypeClass::Unit:
|
||||
return !m_asSupportService;
|
||||
case TypeClass_def::SupportUnit:
|
||||
case TypeClass::SupportUnit:
|
||||
return m_asSupportService;
|
||||
default:
|
||||
break;
|
||||
|
||||
-1
@@ -64,7 +64,6 @@ Q_SIGNALS:
|
||||
void modifyParticipantData(const QVector<ParticipantData> &participantData, const QString &originatorMimeType);
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
bool moveFromPartyToPool(int rootParticipantId, const QString &mimeType);
|
||||
QVector<Participant> getSuperiorParticipants(int participantId);
|
||||
bool convertFromParticipantTemplateToParticipantData(const ParticipantManagement::TemplateParticipant &inputParticipant, ParticipantManagement::ParticipantData &outPutData);
|
||||
|
||||
Reference in new issue
Block a user