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/MapObjectSelection/map_object_model.cpp
+5 -6
View File
@@ -98,16 +98,15 @@ MapObjectModel::MapObjectModel(QObject *parent)
tr("Picture")
},
parent)
, m_logger(getLogger("MapObjectModel"))
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
MapObjectModel::~MapObjectModel()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
void MapObjectModel::initModel(Map *map)
@@ -442,7 +441,7 @@ UniqueMapId MapObjectModel::uniqueMapIdOfIndex(const QModelIndex &index) const
void MapObjectModel::onDataChanged(UniqueMapId uniqueMapId)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START, uniqueMapId=" << uniqueMapId;
TRACE_LOG() << Q_FUNC_INFO << " START, uniqueMapId=" << uniqueMapId;
int row = findRowForUniqueMapId(uniqueMapId);
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/MapObjectSelection/map_object_model.h
+1 -4
View File
@@ -148,10 +148,7 @@ private:
QMap<int, int> m_usedPartyIds;
QSet<QString> m_usedTypeName;
QMap<int, QString> m_usedVulnerabilities;
LOGGER_T m_logger;
QMap<int, QString> m_usedVulnerabilities;
friend class MapObjectProxyModel;
};
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/MapObjectSelection/map_object_selection_widget.cpp
+20 -21
View File
@@ -309,38 +309,37 @@ void MapObjectSelectionLtsDialog::onServiceMonitorRequestedAdd()
MapObjectSelectionWidget::MapObjectSelectionWidget(QWidget *parent)
: BaseClass(parent)
, m_ui(new Ui::MapObjectSelectionDialog)
, m_logger(getLogger("MapObjectSelectionWidget"))
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
m_ui->setupUi(this);
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
MapObjectSelectionWidget::~MapObjectSelectionWidget()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
clearSelectionOfMapObjects(true);
delete m_ui;
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
bool MapObjectSelectionWidget::init(Map *map, AdapterDds *adapterDds)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
if (!map)
{
ERROR_LOG(m_logger) << LOGFUNCTION << " no map";
ERROR_LOG() << Q_FUNC_INFO << " no map";
return false;
}
if (!adapterDds)
{
ERROR_LOG(m_logger) << LOGFUNCTION << " no adapterDds";
ERROR_LOG() << Q_FUNC_INFO << " no adapterDds";
return false;
}
@@ -352,7 +351,7 @@ bool MapObjectSelectionWidget::init(Map *map, AdapterDds *adapterDds)
connect(&m_map->partyIdToColorFunctor(), &PartyIdToColorFunctor::partyChanged,
this, &MapObjectSelectionWidget::onPartyIdsChanged, Qt::UniqueConnection);
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
return true;
}
@@ -418,11 +417,11 @@ void MapObjectSelectionWidget::setMapObjectsToDisplay(const Map::RefPointerMapOb
void MapObjectSelectionWidget::setMapObjectsToDisplay(const QVector<UniqueMapId> &uniqueMapIds)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START, uniqueMapIds.size()=" << uniqueMapIds.size();
TRACE_LOG() << Q_FUNC_INFO << " START, uniqueMapIds.size()=" << uniqueMapIds.size();
if (m_map.isNull())
{
ERROR_LOG(m_logger) << LOGFUNCTION << " no map";
ERROR_LOG() << Q_FUNC_INFO << " no map";
return;
}
@@ -482,7 +481,7 @@ void MapObjectSelectionWidget::setMapObjectsToDisplay(const QVector<UniqueMapId>
if (m_adapterDds->unifiedMapObjectData(uniqueMapId, umodOut))
mapObjectDataVec.append(dataFromUnified(uniqueMapId, umodOut));
else
ERROR_LOG(m_logger) << LOGFUNCTION << " unifiedMapObjectData failed, uniqueMapId=" << uniqueMapId;
ERROR_LOG() << Q_FUNC_INFO << " unifiedMapObjectData failed, uniqueMapId=" << uniqueMapId;
}
@@ -492,7 +491,7 @@ void MapObjectSelectionWidget::setMapObjectsToDisplay(const QVector<UniqueMapId>
m_ui->ltsDataView->setSortIndicator(MapObjectModel::Columns::EQUIPMENT_NUMBER, Qt::AscendingOrder);
m_ui->ltsDataView->setSortIndicator(MapObjectModel::Columns::PARTY, Qt::AscendingOrder);
TRACE_LOG(m_logger) << LOGFUNCTION << " END, uniqueMapIds.size()=" << uniqueMapIds.size();
TRACE_LOG() << Q_FUNC_INFO << " END, uniqueMapIds.size()=" << uniqueMapIds.size();
}
@@ -564,7 +563,7 @@ QVector<int> MapObjectSelectionWidget::visibleBuildingIds() const
bool MapObjectSelectionWidget::addMapObject(const UniqueMapId &uniqueMapId)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START, uniqueMapId=" << uniqueMapId;
TRACE_LOG() << Q_FUNC_INFO << " START, uniqueMapId=" << uniqueMapId;
if (m_map.isNull() || m_adapterDds.isNull() || m_mapObjectModel.isNull())
return false;
@@ -576,13 +575,13 @@ bool MapObjectSelectionWidget::addMapObject(const UniqueMapId &uniqueMapId)
if (m_adapterDds->unifiedMapObjectData(uniqueMapId, umodOut))
return m_mapObjectModel->addMapObjectData(dataFromUnified(uniqueMapId, umodOut));
TRACE_LOG(m_logger) << LOGFUNCTION << " END, uniqueMapId=" << uniqueMapId;
TRACE_LOG() << Q_FUNC_INFO << " END, uniqueMapId=" << uniqueMapId;
return false;
}
bool MapObjectSelectionWidget::updateMapObject(const UniqueMapId &uniqueMapId)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START, uniqueMapId=" << uniqueMapId;
TRACE_LOG() << Q_FUNC_INFO << " START, uniqueMapId=" << uniqueMapId;
if (m_map.isNull() || m_adapterDds.isNull() || !m_mapObjectModel)
return false;
@@ -594,20 +593,20 @@ bool MapObjectSelectionWidget::updateMapObject(const UniqueMapId &uniqueMapId)
if (m_adapterDds->unifiedMapObjectData(uniqueMapId, umodOut))
return m_mapObjectModel->updateMapObjectData(dataFromUnified(uniqueMapId, umodOut));
ERROR_LOG(m_logger) << LOGFUNCTION << " unifiedMapObjectData failed, uniqueMapId=" << uniqueMapId;
TRACE_LOG(m_logger) << LOGFUNCTION << " END, uniqueMapId=" << uniqueMapId;
ERROR_LOG() << Q_FUNC_INFO << " unifiedMapObjectData failed, uniqueMapId=" << uniqueMapId;
TRACE_LOG() << Q_FUNC_INFO << " END, uniqueMapId=" << uniqueMapId;
return false;
}
void MapObjectSelectionWidget::onMapObjectRemoved(UniqueMapId uniqueMapId)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START, uniqueMapId=" << uniqueMapId;
TRACE_LOG() << Q_FUNC_INFO << " START, uniqueMapId=" << uniqueMapId;
if (!m_mapObjectModel)
return;
m_mapObjectModel->remove(uniqueMapId);
TRACE_LOG(m_logger) << LOGFUNCTION << " END, uniqueMapId=" << uniqueMapId;
TRACE_LOG() << Q_FUNC_INFO << " END, uniqueMapId=" << uniqueMapId;
}
void MapObjectSelectionWidget::onPartyIdsChanged()
@@ -648,7 +647,7 @@ void MapObjectSelectionWidget::onMapObjectClicked(UniqueMapId uniqueMapId)
void MapObjectSelectionWidget::onMapObjectEntered(const QModelIndex &index)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
if (!m_mapObjectModel)
return;
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/MapObjectSelection/map_object_selection_widget.h
+1 -1
View File
@@ -3,7 +3,7 @@
#pragma once
#include <SituationMap/sitmapdds_export.h>
#include "sitmapdds_export.h"
#include <Map/map.h>
#include <LtsWidgets/lts_dialog.h>
#include <Common/situation_map_logging.h>