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/Services/AudioVideoManagement/frequency_planning_handler.cpp
+15 -16
View File
@@ -118,7 +118,6 @@ FrequencyPlanningHandler::FrequencyPlanningHandler(Interface::Dts *dts, Interfac
, m_db(db)
, m_frequencySetHandler(frequencySetHandler)
, m_activeExercises(activeExercises)
, m_logger(getLogger("FrequencyPlanningHandler"))
{
Q_ASSERT(dts);
Q_ASSERT(fts);
@@ -157,7 +156,7 @@ bool FrequencyPlanningHandler::init()
QVector<Database::AvmFrequencyPlanning> frequencyPlannings;
if (!m_db->select(frequencyPlannings))
{
ERROR_LOG(m_logger) << "Error while selecting frequency plannings from db";
ERROR_LOG() << "Error while selecting frequency plannings from db";
return false;
}
@@ -170,11 +169,11 @@ bool FrequencyPlanningHandler::init()
m_activePlannings.insert(exerciseId, currentDbData);
if (!m_dts->publish(ActiveFrequencyPlanning(exerciseId, currentDbData.frequencyPlanningId)))
ERROR_LOG(m_logger) << "Error while publishing ActiveFrequencyPlanning with ID " << exerciseId;
ERROR_LOG() << "Error while publishing ActiveFrequencyPlanning with ID " << exerciseId;
};
if (!m_db->select(cbAfp))
{
ERROR_LOG(m_logger) << "Error while selecting AvmActiveFrequencyPlannings from db";
ERROR_LOG() << "Error while selecting AvmActiveFrequencyPlannings from db";
return false;
}
@@ -186,7 +185,7 @@ void FrequencyPlanningHandler::onModifyFrequencyPlanningRequest(const rti::core:
{
auto ret = request.id() > 0 ? handleModify(request) : handleCreate(request);
if (ret.error())
WARNING_LOG(m_logger) << ret();
WARNING_LOG() << ret();
m_fts->modifyFrequencyPlanningReply(cookie, ret);
}
@@ -195,7 +194,7 @@ void FrequencyPlanningHandler::onRemoveFrequencyPlanningRequest(const rti::core:
{
auto ret = handleRemove(request);
if (ret.error())
WARNING_LOG(m_logger) << ret();
WARNING_LOG() << ret();
m_fts->removeFrequencyPlanningReply(cookie, ret);
}
@@ -204,7 +203,7 @@ void FrequencyPlanningHandler::onModifyActiveFrequencyPlanningRequest(const rti:
{
auto ret = modifyActiveFrequencyPlanningRequest(request);
if (ret.error())
WARNING_LOG(m_logger) << ret();
WARNING_LOG() << ret();
m_fts->modifyActiveFrequencyPlanningReply(cookie, ret);
}
@@ -213,7 +212,7 @@ void FrequencyPlanningHandler::onRemoveActiveFrequencyPlanningRequest(const rti:
{
auto ret = removeActiveFrequencyPlanningRequest(request);
if (ret.error())
WARNING_LOG(m_logger) << ret();
WARNING_LOG() << ret();
m_fts->removeActiveFrequencyPlanningReply(cookie, ret);
}
@@ -264,7 +263,7 @@ Core::FunctionReplyObject FrequencyPlanningHandler::handleCreate(const ModifyFre
status = m_db->insert(dbEntry);
if (!status)
{
WARNING_LOG(m_logger) << "Failed to insert new FrequencyPlanningData into DB";
WARNING_LOG() << "Failed to insert new FrequencyPlanningData into DB";
break;
}
dbEntries.push_back(dbEntry);
@@ -308,7 +307,7 @@ Q_ASSERT(request.id() > 0);
status = m_db->insert(dbEntry);
if (!status)
{
WARNING_LOG(m_logger) << "Failed to insert new FrequencyPlanningData into DB";
WARNING_LOG() << "Failed to insert new FrequencyPlanningData into DB";
break;
}
dbEntries.push_back(dbEntry);
@@ -445,7 +444,7 @@ std::vector<Database::AvmFrequencyPlanningData> FrequencyPlanningHandler::insert
Core::FunctionReplyObject FrequencyPlanningHandler::modifyActiveFrequencyPlanningRequest(const ModifyActiveFrequencyPlanningRequest &request)
{
DEBUG_LOG(m_logger) << "ModifyActiveFrequencyPlanningRequest: " << request;
DEBUG_LOG() << "ModifyActiveFrequencyPlanningRequest: " << request;
Core::FunctionReplyObject reply = validateRequest(request);
if (reply.error())
@@ -481,7 +480,7 @@ Core::FunctionReplyObject FrequencyPlanningHandler::modifyActiveFrequencyPlannin
Core::FunctionReplyObject FrequencyPlanningHandler::removeActiveFrequencyPlanningRequest(const RemoveActiveFrequencyPlanningRequest &request)
{
DEBUG_LOG(m_logger) << "RemoveActiveFrequencyPlanningRequest: " << request;
DEBUG_LOG() << "RemoveActiveFrequencyPlanningRequest: " << request;
Core::FunctionReplyObject reply(request.exerciseId());
@@ -669,7 +668,7 @@ bool FrequencyPlanningHandler::collectAndPublish(const Database::AvmFrequencyPla
bool status = m_db->selectByFrequencyPlanningId(dbEntries, planDb.id);
if (!status)
{
ERROR_LOG(m_logger) << "Error selecting AvmFrequencyPlanningData from db";
ERROR_LOG() << "Error selecting AvmFrequencyPlanningData from db";
return false;
}
@@ -692,7 +691,7 @@ void FrequencyPlanningHandler::addPlan(const FrequencyPlanning &plan)
bool status = m_dts->publish(plan);
if (!status)
ERROR_LOG(m_logger) << QStringLiteral("Failed to publish 'FrequencyPlanning' data with id %1 (create)").arg(plan.id());
ERROR_LOG() << QStringLiteral("Failed to publish 'FrequencyPlanning' data with id %1 (create)").arg(plan.id());
emit planningChanged();
}
@@ -707,7 +706,7 @@ void FrequencyPlanningHandler::updatePlan(const FrequencyPlanning &plan)
bool status = m_dts->publish(plan);
if (!status)
ERROR_LOG(m_logger) << QStringLiteral("Failed to publish 'FrequencyPlanning' data with id %1 (modify)").arg(plan.id());
ERROR_LOG() << QStringLiteral("Failed to publish 'FrequencyPlanning' data with id %1 (modify)").arg(plan.id());
emit planningChanged();
}
@@ -721,7 +720,7 @@ void FrequencyPlanningHandler::removePlan(int32_t planId)
bool status = m_dts->removeFrequencyPlanningByKey(planId);
if (!status)
ERROR_LOG(m_logger) << QStringLiteral("Failed to publish 'FrequencyPlanning' with id %1 (remove)").arg(planId);
ERROR_LOG() << QStringLiteral("Failed to publish 'FrequencyPlanning' with id %1 (remove)").arg(planId);
emit planningChanged();
}