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
+8
-9
@@ -24,9 +24,8 @@ CriteriumDialog::CriteriumDialog(const QString &menuGroup, LtsSession::LtsSessio
|
||||
, m_menuGroup(menuGroup)
|
||||
, m_ownEvaluationElements(ownEvlElements)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_logger(getLogger("CriteriumDialog"))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "CriteriumDialog ctor";
|
||||
DEBUG_LOG() << "CriteriumDialog ctor";
|
||||
m_ui->setupUi(this);
|
||||
m_buttonBox->connectButton(LtsWidgets::DialogButton::Print, this, &CriteriumDialog::onPrint);
|
||||
|
||||
@@ -90,13 +89,13 @@ void CriteriumDialog::tableColumnOrganiserSetting()
|
||||
|
||||
void CriteriumDialog::slotAdd()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "CriteriumDialog::slotAdd";
|
||||
DEBUG_LOG() << "CriteriumDialog::slotAdd";
|
||||
editCriterium(0 );
|
||||
}
|
||||
|
||||
void CriteriumDialog::slotEdit()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "CriteriumDialog::slotEdit";
|
||||
DEBUG_LOG() << "CriteriumDialog::slotEdit";
|
||||
|
||||
const QModelIndex srcIdx = m_ui->widget->currentIndex();
|
||||
editCriterium(m_model->getRowData(srcIdx.row()).id() );
|
||||
@@ -104,20 +103,20 @@ void CriteriumDialog::slotEdit()
|
||||
|
||||
void CriteriumDialog::slotRemove()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "CriteriumDialog::slotRemove";
|
||||
DEBUG_LOG() << "CriteriumDialog::slotRemove";
|
||||
const QModelIndex selIndex = m_ui->widget->currentIndex();
|
||||
if (!selIndex.isValid())
|
||||
return;
|
||||
|
||||
Core::RemoveElementRequest req(m_model->getRowData(selIndex.row()).id());
|
||||
DEBUG_LOG(m_logger) << "Removing criterium id = " << req.id();
|
||||
DEBUG_LOG() << "Removing criterium id = " << req.id();
|
||||
m_requestHelper->startSingleRequest([req, this]()
|
||||
{
|
||||
return m_ftc->evlCriteriumRemoveRequest(req, this);
|
||||
});
|
||||
|
||||
if (m_requestHelper->failed())
|
||||
ERROR_LOG(m_logger) << "Failed to remove criterium";
|
||||
ERROR_LOG() << "Failed to remove criterium";
|
||||
}
|
||||
|
||||
|
||||
@@ -146,7 +145,7 @@ bool CriteriumDialog::init(const std::shared_ptr<Interface::Dtc> &dtc,
|
||||
int exerciseId,
|
||||
int currentOperatorId)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "CriteriumDialog::init";
|
||||
DEBUG_LOG() << "CriteriumDialog::init";
|
||||
m_dtc = dtc;
|
||||
m_ftc = ftc;
|
||||
m_opmCbxDtc = opmCbxDtc;
|
||||
@@ -176,7 +175,7 @@ bool CriteriumDialog::init(const std::shared_ptr<Interface::Dtc> &dtc,
|
||||
for (auto i = criteria.constBegin(); i != criteria.constEnd(); ++i)
|
||||
{
|
||||
const EvaluationCriterium &p = (*i);
|
||||
DEBUG_LOG(m_logger) << "Criterium: id = " << p.id() << ", name = " << p.name().c_str() << ", desc = " << p.description().c_str();
|
||||
DEBUG_LOG() << "Criterium: id = " << p.id() << ", name = " << p.name().c_str() << ", desc = " << p.description().c_str();
|
||||
}
|
||||
|
||||
connect(m_ui->widget, &LtsDataView::LtsDataView::signalSelectionChanged, this, &CriteriumDialog::enaDisa, Qt::UniqueConnection);
|
||||
|
||||
Reference in new issue
Block a user