Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen
- 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:
2785 files changed
+18754
-18316
No files matched your search
-2
@@ -43,7 +43,5 @@ private:
|
||||
|
||||
private:
|
||||
QMap<ProjectDataManagement::VulnerabilityState, QSet<int32_t> > m_participantStates;
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
}
|
||||
+2
-2
@@ -61,8 +61,8 @@ void SimpleChartModel::onDynamicParticipantDataChanged(const ParticipantManageme
|
||||
|
||||
const ParticipantManagement::StateInformation &stateInfo = m_config.ppmDtc->youngestStateInformation(data.stateHistory());
|
||||
|
||||
DEBUG_LOG(m_logger) << "Participant id = " << data.participantId();
|
||||
DEBUG_LOG(m_logger) << "State Info Vulnerability = " << stateInfo.vulnerabilityState();
|
||||
DEBUG_LOG() << "Participant id = " << data.participantId();
|
||||
DEBUG_LOG() << "State Info Vulnerability = " << stateInfo.vulnerabilityState();
|
||||
|
||||
if (stateInfo.vulnerabilityState() < ProjectDataManagement::VulnerabilityState::CatastrophicKill)
|
||||
setCombatReady(data.participantId());
|
||||
|
||||
-2
@@ -40,7 +40,5 @@ private:
|
||||
private:
|
||||
QSet<int32_t> m_combatReadyParticipants;
|
||||
QSet<int32_t> m_catastrophicKilledParticipants;
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
}
|
||||
+2
-2
@@ -184,7 +184,7 @@ bool CreateReportDialog::apply()
|
||||
m_ppmDtc,
|
||||
participantIds);
|
||||
|
||||
DEBUG_LOG(m_logger) << "Creating new ReportDialog with config: "
|
||||
DEBUG_LOG() << "Creating new ReportDialog with config: "
|
||||
<< chartConfig.toJson().toJson();
|
||||
ReportDialog *dialog = new ReportDialog(chartConfig, this);
|
||||
|
||||
@@ -215,7 +215,7 @@ void CreateReportDialog::setChildrenSelected(const QModelIndex &parent)
|
||||
if (m_participantModel->hasChildren(childIndex))
|
||||
setChildrenSelected(childIndex);
|
||||
|
||||
DEBUG_LOG(m_logger) << "Setting row "
|
||||
DEBUG_LOG() << "Setting row "
|
||||
<< childIndex.row()
|
||||
<< " selected";
|
||||
|
||||
|
||||
-1
@@ -56,6 +56,5 @@ private:
|
||||
ParticipantManagement::ParticipantEditModel *m_participantModel;
|
||||
TypeModel *m_typeModel;
|
||||
QStringList m_usedNames;
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
}
|
||||
+2
-2
@@ -37,7 +37,7 @@ ReportDialog::ReportDialog(const AbstractChartModel::ChartConfig &config, QWidge
|
||||
{
|
||||
QString errorStr = tr("Not possible to draw diagram. There are no participants to be looked at");
|
||||
m_ui->verticalLayout->addWidget(new QLabel(errorStr, this));
|
||||
ERROR_LOG(m_logger) << errorStr;
|
||||
ERROR_LOG() << errorStr;
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -152,7 +152,7 @@ KDChart::Chart *ReportDialog::createNewChart(const AbstractChartModel::ChartConf
|
||||
|
||||
if (!diagram)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Got unkown chart type. Aborting.";
|
||||
ERROR_LOG() << "Got unkown chart type. Aborting.";
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
-1
@@ -43,6 +43,5 @@ private:
|
||||
private:
|
||||
Ui::ReportDialog *m_ui;
|
||||
QString m_name;
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
}
|
||||
-1
@@ -23,7 +23,6 @@ protected:
|
||||
bool isFiltered(const ParticipantManagement::Type &data, DataModification modType) const override;
|
||||
private:
|
||||
std::shared_ptr<ParticipantManagement::Interface::Dtc> m_ppmDtc;
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user