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 eb1d949edc
commit 815e16368e
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/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_avail_streams_model.cpp
+4 -5
View File
@@ -21,12 +21,11 @@ QDataStream& operator>>(QDataStream& ds, StreamData& sd)
AvailStreamsModel::AvailStreamsModel(Interface::Dtc* avmDtc, int32_t exerciseId, QObject* parent)
: NGLTreeModel(parent, new NGLTreeItem(QVariant()), {tr("Available")}), m_exerciseId(exerciseId), m_avmDtc(avmDtc),
m_cnrRoot(new NGLTreeItem(QVariant())), m_tvcRoot(new NGLTreeItem(QVariant())), m_changes(false)
m_cnrRoot(new NGLTreeItem(QVariant())), m_tvcRoot(new NGLTreeItem(QVariant())), m_changes(false),
m_logger(getLogger("AudioSettingsAvailStreamsModel"))
{
Q_ASSERT(avmDtc);
qRegisterMetaTypeStreamOperators<StreamData>();
setMimeType(StreamData::mimeType());
StreamData data;
@@ -168,7 +167,7 @@ void AvailStreamsModel::insertUpdateData(const T& config, DataModification modTy
if (modType == DataModification::eModified)
{
if (config.exerciseId().is_set() && config.exerciseId().get() != m_exerciseId)
if (config.exerciseId.has_value() && config.exerciseId.get() != m_exerciseId)
action = DataModification::eRemoved;
}
@@ -177,7 +176,7 @@ void AvailStreamsModel::insertUpdateData(const T& config, DataModification modTy
switch (action)
{
case DataModification::eAdded:
if (config.exerciseId().is_set() && config.exerciseId().get() != m_exerciseId)
if (config.exerciseId.has_value() && config.exerciseId.get() != m_exerciseId)
break;
Q_FALLTHROUGH();
case DataModification::eModified: {
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_dialog.cpp
+35 -35
View File
@@ -17,7 +17,7 @@ namespace AudioVideoManagement
{
AudioSettingsDialog::AudioSettingsDialog(QWidget* parent)
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel), m_ui(new Ui::AudioSettingsDialog),
m_requestHelper(new LtsUtils::RequestHelper(this))
m_requestHelper(new LtsUtils::RequestHelper(this)), m_logger(getLogger("AudioSettingsDialog"))
{
m_ui->setupUi(this);
setAttribute(Qt::WA_DeleteOnClose);
@@ -111,9 +111,9 @@ void AudioSettingsDialog::onOperatorChanged(const OperatorManagement::User& data
switch (modType)
{
case DataModification::eRemoved: {
Q_ASSERT(m_operatorMap.contains(data.id()));
Q_ASSERT(m_operatorMap.contains(data.id));
if (m_ui->operatorComboBox->currentData().toInt() == data.id())
if (m_ui->operatorComboBox->currentData().toInt() == data.id)
{
__unchange__();
m_modelAllocated->resetChangeState();
@@ -121,25 +121,25 @@ void AudioSettingsDialog::onOperatorChanged(const OperatorManagement::User& data
m_filterAvailable->invalidate();
}
m_operatorMap.remove(data.id());
m_ui->operatorComboBox->removeItem(m_ui->operatorComboBox->findData(data.id()));
m_operatorMap.remove(data.id);
m_ui->operatorComboBox->removeItem(m_ui->operatorComboBox->findData(data.id));
break;
}
case DataModification::eAdded: {
Q_ASSERT(!m_operatorMap.contains(data.id()));
const QString operatorName = QString::fromStdString(data.name());
m_operatorMap.insert(data.id(), operatorName);
m_ui->operatorComboBox->addItem(operatorName, data.id());
Q_ASSERT(!m_operatorMap.contains(data.id));
const QString operatorName = QString::fromStdString(data.name);
m_operatorMap.insert(data.id, operatorName);
m_ui->operatorComboBox->addItem(operatorName, data.id);
m_ui->operatorComboBox->model()->sort(0);
break;
}
case DataModification::eModified: {
Q_ASSERT(m_operatorMap.contains(data.id()));
const QString operatorName = QString::fromStdString(data.name());
m_operatorMap.insert(data.id(), operatorName);
int i = m_ui->operatorComboBox->findData(data.id());
Q_ASSERT(m_operatorMap.contains(data.id));
const QString operatorName = QString::fromStdString(data.name);
m_operatorMap.insert(data.id, operatorName);
int i = m_ui->operatorComboBox->findData(data.id);
Q_ASSERT(i != -1);
m_ui->operatorComboBox->setItemText(i, operatorName);
m_ui->operatorComboBox->model()->sort(0);
@@ -150,15 +150,15 @@ void AudioSettingsDialog::onOperatorChanged(const OperatorManagement::User& data
void AudioSettingsDialog::onCnrTvcProfileChanged(const CnrTvcProfile& data, DataModification modType)
{
if (m_session->exerciseId() == data.exerciseId())
if (m_session->exerciseId() == data.exerciseId)
{
if (modType == DataModification::eRemoved)
{
m_cnrTvcProfileMap.remove(data.id());
m_cnrTvcProfileMap.remove(data.id);
}
else
{
m_cnrTvcProfileMap.insert(data.id(), data);
m_cnrTvcProfileMap.insert(data.id, data);
fillOperatorList();
}
}
@@ -170,12 +170,12 @@ void AudioSettingsDialog::fillOperatorList()
for (const auto& rc : std::as_const(m_cnrTvcProfileMap))
{
if ((rc.exerciseId() != m_session->exerciseId()) ||
(rc.operatorId() != m_ui->operatorComboBox->currentData().toInt()))
if ((rc.exerciseId != m_session->exerciseId()) ||
(rc.operatorId != m_ui->operatorComboBox->currentData().toInt()))
continue;
newStreamData.reserve(rc.data().size());
for (const CnrTvcProfileData& profileEntry : rc.data())
newStreamData.reserve(rc.data.size());
for (const CnrTvcProfileData& profileEntry : rc.data)
newStreamData += toStreamData(profileEntry);
break;
@@ -264,12 +264,12 @@ bool AudioSettingsDialog::applyRemove()
for (const auto& profile : std::as_const(m_cnrTvcProfileMap))
{
if (profile.operatorId() != m_operatorId)
if (profile.operatorId != m_operatorId)
continue;
removeRequest.id(profile.id());
removeRequest.id = profile.id;
break;
}
if (removeRequest.id() <= 0)
if (removeRequest.id <= 0)
return true;
m_requestHelper->startSingleRequest(
@@ -285,23 +285,23 @@ bool AudioSettingsDialog::applyModify()
for (const auto& profile : std::as_const(m_cnrTvcProfileMap))
{
if (profile.operatorId() != m_operatorId)
if (profile.operatorId != m_operatorId)
continue;
modifyRequest.id(profile.id());
modifyRequest.id = profile.id;
break;
}
modifyRequest.exerciseId(m_session->exerciseId());
modifyRequest.operatorId(m_operatorId);
modifyRequest.exerciseId = m_session->exerciseId();
modifyRequest.operatorId = m_operatorId;
const QVector<StreamData> allocatedList = m_modelAllocated->getStreamDataVector();
modifyRequest.data().reserve(allocatedList.size());
modifyRequest.data.reserve(allocatedList.size());
for (const StreamData& stream : allocatedList)
{
CnrTvcProfileData circuitData;
circuitData.radioSystemId(stream.bIsCnr ? RadioSystem::Cnr : RadioSystem::Tvc);
circuitData.radioCircuitId(stream.topicId);
modifyRequest.data().push_back(std::move(circuitData));
circuitData.radioSystemId = stream.bIsCnr ? RadioSystem::Cnr : RadioSystem::Tvc;
circuitData.radioCircuitId = stream.topicId;
modifyRequest.data.push_back(std::move(circuitData));
}
m_requestHelper->startSingleRequest(
@@ -383,18 +383,18 @@ void AudioSettingsDialog::onEntryRemoved(const StreamData& stream)
StreamData AudioSettingsDialog::toStreamData(const CnrTvcProfileData& profileEntry) const
{
int configId = profileEntry.radioCircuitId();
int configId = profileEntry.radioCircuitId;
StreamData streamData;
streamData.topicId = configId;
if (profileEntry.radioSystemId() == RadioSystem::Cnr)
if (profileEntry.radioSystemId == RadioSystem::Cnr)
{
streamData.name = QString::fromStdString(m_avmDtc->cnrConfig(configId).radioCircuit());
streamData.name = QString::fromStdString(m_avmDtc->cnrConfig(configId).radioCircuit);
streamData.bIsCnr = true;
}
else
{
streamData.name = QString::fromStdString(m_avmDtc->tvcConfig(configId).radioCircuit());
streamData.name = QString::fromStdString(m_avmDtc->tvcConfig(configId).radioCircuit);
streamData.bIsCnr = false;
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_used_streams_model.cpp
+2 -1
View File
@@ -10,7 +10,8 @@ namespace AudioVideoManagement
{
AllocatedStreamsModel::AllocatedStreamsModel(QObject* parent)
: NGLTreeModel(parent, new NGLTreeItem(QVariant(QLatin1String("root"))), {tr("Allocated")})
: NGLTreeModel(parent, new NGLTreeItem(QVariant(QLatin1String("root"))), {tr("Allocated")}),
m_logger(getLogger("AudioSettingsUsedStreamsModel"))
{
setMimeType(StreamData::mimeType());
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_stream_type.h
+4 -4
View File
@@ -19,14 +19,14 @@ struct StreamData : boost::totally_ordered<StreamData>
StreamData() = default;
explicit StreamData(const TvcConfig &tvcConfig)
: name(QString::fromStdString(tvcConfig.radioCircuit()))
, topicId(tvcConfig.id())
: name(QString::fromStdString(tvcConfig.radioCircuit))
, topicId(tvcConfig.id)
, bIsCnr(false)
{}
explicit StreamData(const CnrConfig &cnrConfig)
: name(QString::fromStdString(cnrConfig.radioCircuit()))
, topicId(cnrConfig.id())
: name(QString::fromStdString(cnrConfig.radioCircuit))
, topicId(cnrConfig.id)
, bIsCnr(true)
{}