lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen

Browse Source 
- NGL_ADD_LIBRARY2: 87 CMakeLists.txt konvertiert für Export-Header Generierung
- 44 Export-Header Include-Pfade korrigiert (_export.h)
- 81 DDS-Stub-Header generiert (*_dtc.h, *_fts.h, *_dts.h, *_ftc.h)
- INGLLogger: Duplikat gelöscht, m_logger Member entfernt, variadische Makros
- Q_FUNC_INFO Redefinition behoben (Qt6 definiert bereits)
- FATAL_LOG Makro hinzugefügt
- InfrastructureManagement DDS-Stubs (ism.hpp, ism_enums.hpp, ism_ftc.h)
- FilterManagement DDS-Stubs (flt_ftc.h, flt_dts.h)
- AreaEffectSimulation DDS-Stubs (aes.hpp, aes_enums.hpp)
- SymbolAppearance Klasse vollständig definiert mit content() Methode
- BuildingComponentFilter Klasse definiert mit Copy-Konstruktor
- Ftc Factory: nullptr Return (abstract class)
- AesFilter Klasse in aes.hpp hinzugefügt
- Dtc Klasse in ppm.hpp mit participantChanged Signal
- AesType Enum: alle 15 At* Werte definiert
- AesEffectState_def: EsReceived hinzugefügt
- DataModification Enum: eAdded/eModified/eRemoved
- function_reply_object.h → core_types.h Include-Pfad (72 Dateien)
- Enum-Class-Streaming Template-Operator in INGLLogger.h
- ism_mounting_point.h: QImage → QtGui/QImage, QGuiApplication/QScreen
- ism_data_plugin_interface.h: QSet Include, Include-Reihenfolge
- QRegExp → QRegularExpression in tpm_js_parser.cpp
- .underlying() Aufrufe zu direktem Enum-Vergleich korrigiert
- Include-Pfade: aes.hpp in symbol_appearance_settings_impl.h und aes_display_filter_impl.h

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
torstenandCopilot committed 2026-08-19 06:06:24 +02:00
1 parent 010f91928a
commit b774f4035c
2785 files changed
+18754 -18316
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/ConfigureUrl/sitmap_configure_url_widget.cpp
+7 -8
View File
@@ -89,9 +89,8 @@ void ConfigureSingleMapUrl::onClose()
ConfigureMapUrlsWidget::ConfigureMapUrlsWidget(QWidget *parent)
: QWidget(parent)
, m_ui(new Ui::Configure_Urls_Widget)
, m_logger(getLogger("ConfigureMapUrlsWidget"))
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
m_ui->setupUi(this);
connect(m_ui->pbUp, &QPushButton::clicked, this, &ConfigureMapUrlsWidget::onUpClicked);
@@ -100,14 +99,14 @@ ConfigureMapUrlsWidget::ConfigureMapUrlsWidget(QWidget *parent)
connect(m_ui->pbModify, &QPushButton::clicked, this, &ConfigureMapUrlsWidget::onModfiyClicked);
connect(m_ui->pbRemove, &QPushButton::clicked, this, &ConfigureMapUrlsWidget::onRemoveClicked);
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
ConfigureMapUrlsWidget::~ConfigureMapUrlsWidget()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
delete m_ui;
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
void ConfigureMapUrlsWidget::setModel(ConfigureMapUrlModel *model)
@@ -172,7 +171,7 @@ void ConfigureMapUrlsWidget::onAddClicked()
}
void ConfigureMapUrlsWidget::addSingleUrl()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
if (!m_configureMapUrlModel)
return;
@@ -201,7 +200,7 @@ void ConfigureMapUrlsWidget::onModfiyClicked()
}
void ConfigureMapUrlsWidget::modifySingleUrl()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
if (!m_configureMapUrlModel)
return;
@@ -215,7 +214,7 @@ void ConfigureMapUrlsWidget::modifySingleUrl()
void ConfigureMapUrlsWidget::onRemoveClicked()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
int currentRow = m_ui->tvLayer->currentIndex().row();
m_configureMapUrlModel->removeRow(currentRow);
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/ConfigureUrl/sitmap_configure_url_widget.h
-2
View File
@@ -104,8 +104,6 @@ private:
Ui::Configure_Urls_Widget *m_ui;
ConfigureMapUrlModel *m_configureMapUrlModel = nullptr;
bool m_placeholderTextFile = false;
LOGGER_T m_logger;
};
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/ConfigureUrl/sitmap_configure_urls.cpp
+38 -39
View File
@@ -21,9 +21,8 @@ ConfigureMapUrls::ConfigureMapUrls(QWidget *parent)
, m_pluginProvider(nullptr)
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_ui(new Ui::Configure_Urls)
, m_logger(getLogger("ConfigureMapUrls"))
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
m_ui->setupUi(this);
@@ -57,24 +56,24 @@ ConfigureMapUrls::ConfigureMapUrls(QWidget *parent)
setOnlineHelpFilename(QStringLiteral("Configuration_of_Modells_SLPKs"));
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
ConfigureMapUrls::~ConfigureMapUrls()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
delete m_ui;
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
bool ConfigureMapUrls::init(PluginProvider *pluginProvider)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
m_pluginProvider = pluginProvider;
if (!m_pluginProvider)
{
ERROR_LOG(m_logger) << LOGFUNCTION << " no pluginProvider";
ERROR_LOG() << Q_FUNC_INFO << " no pluginProvider";
return false;
}
@@ -82,14 +81,14 @@ bool ConfigureMapUrls::init(PluginProvider *pluginProvider)
m_asmDtc = m_pluginProvider->asmDtc();
if (!m_asmDtc)
{
ERROR_LOG(m_logger) << LOGFUNCTION << " Can not retrieve AssetManagement::DTC";
ERROR_LOG() << Q_FUNC_INFO << " Can not retrieve AssetManagement::DTC";
bRet = false;
}
m_asmFtc = m_pluginProvider->asmFtc();
if (!m_asmFtc)
{
ERROR_LOG(m_logger) << LOGFUNCTION << " Can not retrieve AssetManagement::FTC";
ERROR_LOG() << Q_FUNC_INFO << " Can not retrieve AssetManagement::FTC";
bRet = false;
}
@@ -101,16 +100,16 @@ bool ConfigureMapUrls::init(PluginProvider *pluginProvider)
fillTrainingAreaCbx();
syncTaToGui();
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
return bRet;
}
void ConfigureMapUrls::fillTrainingAreaCbx()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
if (!m_asmDtc)
{
ERROR_LOG(m_logger) << LOGFUNCTION << " no dtc";
ERROR_LOG() << Q_FUNC_INFO << " no dtc";
return;
}
@@ -136,18 +135,18 @@ void ConfigureMapUrls::fillTrainingAreaCbx()
const int newTrainingAreaId = m_ui->cbTrainingArea->currentData().toInt();
if (!retrieveTaOfService(newTrainingAreaId))
{
ERROR_LOG(m_logger) << LOGFUNCTION << " retrieveTrainingAreaOfService failed";
ERROR_LOG() << Q_FUNC_INFO << " retrieveTrainingAreaOfService failed";
return;
}
}
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
void ConfigureMapUrls::onSelectedTrainingAreaChanged(const QString & )
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
const int newTrainingAreaId = m_ui->cbTrainingArea->currentData().toInt();
if (m_trainingArea.id() == newTrainingAreaId)
return;
@@ -160,23 +159,23 @@ void ConfigureMapUrls::onSelectedTrainingAreaChanged(const QString & )
apply();
if (!retrieveTaOfService(newTrainingAreaId))
{
ERROR_LOG(m_logger) << LOGFUNCTION << " retrieveTrainingAreaOfService failed";
ERROR_LOG() << Q_FUNC_INFO << " retrieveTrainingAreaOfService failed";
return;
}
break;
case LtsWidgets::Button::Cancel:
INFO_LOG(m_logger) << LOGFUNCTION << " set back to m_trainingArea.id() = " << m_trainingArea.id();
INFO_LOG() << Q_FUNC_INFO << " set back to m_trainingArea.id() = " << m_trainingArea.id();
m_ui->cbTrainingArea->setCurrentIndex(m_ui->cbTrainingArea->findData(QVariant(m_trainingArea.id()), Qt::UserRole));
break;
case LtsWidgets::Button::Discard:
if (!retrieveTaOfService(newTrainingAreaId))
{
ERROR_LOG(m_logger) << LOGFUNCTION << " retrieveTrainingAreaOfService failed";
ERROR_LOG() << Q_FUNC_INFO << " retrieveTrainingAreaOfService failed";
return;
}
break;
default:
ERROR_LOG(m_logger) << LOGFUNCTION << " got unexpected!!!";
ERROR_LOG() << Q_FUNC_INFO << " got unexpected!!!";
break;
}
}
@@ -184,22 +183,22 @@ void ConfigureMapUrls::onSelectedTrainingAreaChanged(const QString & )
{
if (!retrieveTaOfService(newTrainingAreaId))
{
ERROR_LOG(m_logger) << LOGFUNCTION << " retrieveTrainingAreaOfService failed";
ERROR_LOG() << Q_FUNC_INFO << " retrieveTrainingAreaOfService failed";
return;
}
}
syncTaToGui();
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
bool ConfigureMapUrls::retrieveTaOfService(int trainingAreaId)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START, trainingAreaId=" << trainingAreaId;
TRACE_LOG() << Q_FUNC_INFO << " START, trainingAreaId=" << trainingAreaId;
if (!m_asmDtc)
{
ERROR_LOG(m_logger) << LOGFUNCTION << " no dtc";
ERROR_LOG() << Q_FUNC_INFO << " no dtc";
return false;
}
@@ -211,14 +210,14 @@ bool ConfigureMapUrls::retrieveTaOfService(int trainingAreaId)
AssetManagement::TrainingArea ta = m_asmDtc->trainingArea(trainingAreaId);
if (ta.id() != trainingAreaId)
{
ERROR_LOG(m_logger) << LOGFUNCTION << " switch to m_trainingArea failed (taId=" << trainingAreaId << ")";
ERROR_LOG() << Q_FUNC_INFO << " switch to m_trainingArea failed (taId=" << trainingAreaId << ")";
return false;
}
m_trainingArea = ta;
INFO_LOG(m_logger) << LOGFUNCTION << " switch to m_trainingArea " << m_trainingArea.id()
INFO_LOG() << Q_FUNC_INFO << " switch to m_trainingArea " << m_trainingArea.id()
<< ", ta" << ta;
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
return true;
}
@@ -252,7 +251,7 @@ void basicConfig(ConfigureMapUrlsWidget *tv, bool showTypeMinMax = true)
void ConfigureMapUrls::syncTaToGui()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
ConfigureMapUrlsWidget *w;
@@ -260,7 +259,7 @@ void ConfigureMapUrls::syncTaToGui()
if (w && w->model())
{
w->model()->setData(vecToVec(m_trainingArea.map2D()));
TRACE_LOG(m_logger) << LOGFUNCTION << " model->rowCount()" << w->model()->rowCount();
TRACE_LOG() << Q_FUNC_INFO << " model->rowCount()" << w->model()->rowCount();
}
basicConfig(w);
@@ -275,7 +274,7 @@ void ConfigureMapUrls::syncTaToGui()
if (w && w->model())
{
w->model()->setData(vecToVec(m_trainingArea.scene3D()));
TRACE_LOG(m_logger) << LOGFUNCTION << " model->rowCount()" << w->model()->rowCount();
TRACE_LOG() << Q_FUNC_INFO << " model->rowCount()" << w->model()->rowCount();
}
basicConfig(w);
@@ -289,12 +288,12 @@ void ConfigureMapUrls::syncTaToGui()
w->model()->setData(vecToVec(m_trainingArea.sceneObjects()));
basicConfig(w, false);
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
void ConfigureMapUrls::syncGuiToTa()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
ConfigureMapUrlsWidget *w;
@@ -327,7 +326,7 @@ void ConfigureMapUrls::syncGuiToTa()
item.mapDescriptionTypeId(AssetManagement::MapDescriptionType_def::SceneObj);
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
void ConfigureMapUrls::retranslate()
@@ -338,11 +337,11 @@ void ConfigureMapUrls::retranslate()
bool ConfigureMapUrls::apply()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
if (!m_asmFtc)
{
ERROR_LOG(m_logger) << LOGFUNCTION << " Can not retrieve AssetManagement::FTC";
ERROR_LOG() << Q_FUNC_INFO << " Can not retrieve AssetManagement::FTC";
return false;
}
@@ -353,24 +352,24 @@ bool ConfigureMapUrls::apply()
return m_asmFtc->trainingAreaModifyRequest(m_trainingArea, this);
});
TRACE_LOG(m_logger) << LOGFUNCTION << " END, scucess=" << success;
TRACE_LOG() << Q_FUNC_INFO << " END, scucess=" << success;
return success;
}
void ConfigureMapUrls::onTrainingAreaModifyReply(const Core::FunctionReplyObject &reply)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
if (reply.error())
{
ERROR_LOG(m_logger) << LOGFUNCTION << "Got onTrainingAreaModifyReply error: " << reply();
ERROR_LOG() << Q_FUNC_INFO << "Got onTrainingAreaModifyReply error: " << reply();
return;
}
INFO_LOG(m_logger) << LOGFUNCTION << " Got onTrainingAreaModifyReply with id " << reply.id();
INFO_LOG() << Q_FUNC_INFO << " Got onTrainingAreaModifyReply with id " << reply.id();
m_requestHelper->requestReply(reply);
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/ConfigureUrl/sitmap_configure_urls.h
-2
View File
@@ -72,8 +72,6 @@ private:
AssetManagement::TrainingArea m_trainingArea;
Ui::Configure_Urls *m_ui;
LOGGER_T m_logger;
};
}