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:
torstenandCopilot committed 2026-08-19 06:06:24 +02:00
1 parent 010f91928a
commit b774f4035c
2785 files changed
+18754 -18316

No files matched your search

@@ -18,8 +18,7 @@ EvlCommentsView::EvlCommentsView(const std::shared_ptr<Interface::Dtc> &evlDtc,
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly),
m_ui(new Ui::EvlCommentsDialog),
m_evlDtc(evlDtc),
m_opmDtc(opmDtc),
m_logger(getLogger("EvlComments::EvlCommentsView"))
m_opmDtc(opmDtc)
{
m_ui->setupUi(this);
@@ -46,6 +46,5 @@ private:
EvlCommentDataViewModel *m_model{nullptr};
EvlCommentDataViewProxyModel *m_proxyModel{nullptr};
NGL::INGLLogger &m_logger;
};
}
@@ -75,7 +75,6 @@ EditSchemaDialog::EditSchemaDialog(bool ocMode, bool runningOnTablet, LtsSession
, m_session(session)
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_ui(new Ui::EditSchemaDialog)
, m_logger(getLogger("EditSchemaDialog"))
{
m_ui->setupUi(this);
@@ -302,7 +301,7 @@ void EditSchemaDialog::onNotifyAboutSchema(const Evaluations::EvaluationSchema &
if (jError.error != QJsonParseError::NoError)
{
WARNING_LOG(m_logger) << "Could not parse schema with database id " << data.id();
WARNING_LOG() << "Could not parse schema with database id " << data.id();
return;
}
@@ -349,7 +348,7 @@ void EditSchemaDialog::loadSchema(qint32 schemaId)
if (jError.error != QJsonParseError::NoError)
{
WARNING_LOG(m_logger) << "Could not load schema with database id " << m_mapSchemata.last().id();
WARNING_LOG() << "Could not load schema with database id " << m_mapSchemata.last().id();
return;
}
@@ -904,12 +903,12 @@ void EditSchemaDialog::onLoadFromLibrary()
const QJsonDocument doc(QJsonDocument::fromJson(content, &jError));
if (jError.error != QJsonParseError::NoError)
{
WARNING_LOG(m_logger) << "Could not parse schema !";
WARNING_LOG() << "Could not parse schema !";
return;
}
if (!m_pModel->fromQJsonDocument(doc))
{
WARNING_LOG(m_logger) << "Could not load schema !";
WARNING_LOG() << "Could not load schema !";
return;
}
@@ -930,11 +929,11 @@ bool EditSchemaDialog::onSaveToLibrary()
int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::EvaluationSchema, m_session->exerciseId(), byteArray);
if (fileId > 0)
{
DEBUG_LOG(m_logger) << "Saved file with id = " << fileId;
DEBUG_LOG() << "Saved file with id = " << fileId;
return true;
}
else
ERROR_LOG(m_logger) << "Could not save file in library ";
ERROR_LOG() << "Could not save file in library ";
return false;
}
@@ -131,7 +131,6 @@ private:
LtsUtils::RequestHelper *m_requestHelper{nullptr};
Ui::EditSchemaDialog *m_ui{nullptr};
LOGGER_T m_logger;
};
}
@@ -27,6 +27,5 @@ public:
void removeRow(const QModelIndex &idx, bool deleteRootAllowed = false);
protected:
LOGGER_T m_logger;
};
}
@@ -128,7 +128,7 @@ QJsonDocument TreeModelSchema::toJsonDocument() const
{
Q_UNUSED(idx);
Evaluations::ElementData e = v.value<Evaluations::ElementData>();
INFO_LOG(m_logger) << "toJsonDocument: Name: " << e.getText() << ", elementId: " << e.m_id << ", parent id: " << e.m_parentId;
INFO_LOG() << "toJsonDocument: Name: " << e.getText() << ", elementId: " << e.m_id << ", parent id: " << e.m_parentId;
QJsonObject obj;
obj[QStringLiteral("id")] = e.m_id;
@@ -172,7 +172,7 @@ bool TreeModelSchema::fromQJsonDocument(const QJsonDocument &doc)
m_elementId = std::max(m_elementId, d.m_id);
INFO_LOG(m_logger) << "fromQJsonDocument: " << d.getText() << ", own id = " << d.m_id << ", parent id = " << d.m_parentId;
INFO_LOG() << "fromQJsonDocument: " << d.getText() << ", own id = " << d.m_id << ", parent id = " << d.m_parentId;
}
++m_elementId;
@@ -11,8 +11,7 @@ namespace Evaluations
EvlNewCommentDialog::EvlNewCommentDialog(const std::shared_ptr<OperatorManagement::Interface::Dtc> &opmDtc,
QWidget *parent)
: QDialog(parent),
m_ui(new Ui::EvlNewCommentDialog),
m_logger(getLogger("EvlComments::EvlNewCommentDialog"))
m_ui(new Ui::EvlNewCommentDialog)
{
m_ui->setupUi(this);
setWindowFlags(Qt::Tool);
@@ -34,7 +34,5 @@ private slots:
private:
Ui::EvlNewCommentDialog *m_ui{nullptr};
const int m_maxChars{255};
NGL::INGLLogger &m_logger;
};
}