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/PlanEditor/attribute_dialog_manager.cpp
+11 -13
View File
@@ -216,8 +216,6 @@ public:
, m_ppTeamColor(-1)
, m_ppTeamDColor(-1)
, m_ppTextModifier()
, m_logger(getLogger("AttributeDialogManager"))
{
m_colorDialog -> setOptions(QColorDialog::ColorDialogOptions({QColorDialog::ShowAlphaChannel, QColorDialog::DontUseNativeDialog}));
@@ -263,7 +261,7 @@ public:
if (partyColors.size() > customColorCount)
{
WARNING_LOG(m_logger) << LOGFUNCTION << " To much party colors ("
WARNING_LOG() << Q_FUNC_INFO << " To much party colors ("
<< partyColors.size()
<< ") color dialog custom colors are limited to "
<< customColorCount
@@ -380,21 +378,21 @@ AttributeDialogManager::AttributeDialogManager(PlanEditor
, const PlanEditorSession &session)
: QObject(planEditor), m_internal(new AttributeDialogManager::InternalData(planEditor, map, geoModel, session, this))
{
TRACE_LOG(m_internal->m_logger) << LOGFUNCTION << " START";
TRACE_LOG(m_internal->m_logger) << LOGFUNCTION << " END";
TRACE_LOG(m_internal->m_logger) << Q_FUNC_INFO << " START";
TRACE_LOG(m_internal->m_logger) << Q_FUNC_INFO << " END";
}
AttributeDialogManager::~AttributeDialogManager()
{
TRACE_LOG(m_internal->m_logger) << LOGFUNCTION << " START";
TRACE_LOG(m_internal->m_logger) << Q_FUNC_INFO << " START";
delete m_internal; m_internal = nullptr;
}
void AttributeDialogManager::onOpenDialog(const SituationMap::GeometryModel::Node &node)
{
DEBUG_LOG(m_internal->m_logger) << LOGFUNCTION << " START, node.connectedId() = " << node.connectedId();
DEBUG_LOG(m_internal->m_logger) << Q_FUNC_INFO << " START, node.connectedId() = " << node.connectedId();
if (!node.isValid())
{
@@ -413,7 +411,7 @@ void AttributeDialogManager::onOpenDialog(const SituationMap::GeometryModel::Nod
SituationMap::GeometryModel::PrimitiveType primitiveType = m_internal->m_geoModel->getType(node);
DEBUG_LOG(m_internal->m_logger) << LOGFUNCTION << " primitiveType = " << static_cast<int>(primitiveType)
DEBUG_LOG(m_internal->m_logger) << Q_FUNC_INFO << " primitiveType = " << static_cast<int>(primitiveType)
<< " , m_dlgSymbolModify=" << m_internal->m_dlgSymbolModify
<< " , m_dlgSymbolXML=" << m_internal->m_dlgSymbolXML;
@@ -604,7 +602,7 @@ void AttributeDialogManager::onResetWidgets()
AdvancedSymbology::Gui::SymbolModificationDialog *AttributeDialogManager::InternalData::buildSymbolModifyDialog(QWidget *parent, bool isParticipant)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START "
TRACE_LOG() << Q_FUNC_INFO << " START "
<< ", isParticipant=" << isParticipant
<< ", this=" << this;
@@ -643,7 +641,7 @@ static void colorizeButton(QAbstractButton *button, const QColor color)
SymbologyXML::SymbolDialog *AttributeDialogManager::InternalData::buildSymbolXMLDialog(QWidget *parent)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START " << ", this=" << this;
TRACE_LOG() << Q_FUNC_INFO << " START " << ", this=" << this;
SymbologyXML::SymbolDialog *dlg = new SymbologyXML::SymbolDialog(m_map->symbolDictionary(),m_geoModel,true,parent);
if(dlg)
@@ -1108,7 +1106,7 @@ LtsWidgets::LtsDialog *AttributeDialogManager::InternalData::buildTextAttrBox(QW
LtsWidgets::LtsDialog * AttributeDialogManager::InternalData::buildParticipantBox(QWidget *parent)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START, this=" << this;
TRACE_LOG() << Q_FUNC_INFO << " START, this=" << this;
Dialog *dlg = new Dialog(parent);
dlg->setObjectName(QLatin1String("PlanEditor::ParticipantData"));
@@ -1336,7 +1334,7 @@ LtsWidgets::LtsDialog * AttributeDialogManager::InternalData::buildParticipantBo
m_self->onCloseDialog();
});
TRACE_LOG(m_logger) << LOGFUNCTION << " END, this=" << this;
TRACE_LOG() << Q_FUNC_INFO << " END, this=" << this;
return dlg;
}
@@ -1899,7 +1897,7 @@ void AttributeDialogManager::addStyleAttributes(const SituationMap::GeometryMode
void AttributeDialogManager::getStyleAttributes(const SituationMap::GeometryModel::Node &node)
{
TRACE_LOG(m_internal->m_logger) << LOGFUNCTION << " START "
TRACE_LOG(m_internal->m_logger) << Q_FUNC_INFO << " START "
<< ", m_dlgSymbolModify= " << m_internal->m_dlgSymbolModify
<< ", m_dlgSymbolXML= " << m_internal->m_dlgSymbolXML;
onResetWidgets();