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/cnr_handler.cpp
+15 -17
View File
@@ -126,7 +126,7 @@ public:
Database::AvmDeviceConfig deviceConfig = m_handler->toDeviceConfig(config);
bool status = m_db->insert(deviceConfig);
if (!status)
ERROR_LOG(m_logger) << "Error while inserting device config";
ERROR_LOG() << "Error while inserting device config";
m_cache.insert(config.id(), deviceConfig);
emit m_handler->avDbReloadNeeded();
@@ -142,7 +142,7 @@ public:
newDeviceConfig.id = oldDeviceConfig.id;
bool status = m_db->update(newDeviceConfig);
if (!status)
ERROR_LOG(m_logger) << "Error while updating device config";
ERROR_LOG() << "Error while updating device config";
m_cache[config.id()] = newDeviceConfig;
emit m_handler->avDbReloadNeeded();
@@ -168,7 +168,7 @@ public:
bool status = m_db->removeAvmDeviceConfig(m_cache.value(configId).id);
if (!status)
ERROR_LOG(m_logger) << "Error while removing device config";
ERROR_LOG() << "Error while removing device config";
m_cache.remove(configId);
emit m_handler->avDbReloadNeeded();
@@ -178,7 +178,6 @@ private:
CnrHandler *m_handler;
DatabaseInterface *m_db;
QHash<int32_t, Database::AvmDeviceConfig> m_cache; //!< cnrConfig-Id -> AvmDeviceConfig
LOGGER_T m_logger;
};
@@ -190,7 +189,6 @@ CnrHandler::CnrHandler(Interface::Dts *dts, Interface::Fts *fts, InfrastructureM
, m_frequencyPlanningHandler(frequencyPlanningHandler)
, m_db(db)
, m_activeExercises(activeExercises)
, m_logger(getLogger("CombatNetRadioHandler"))
, m_deviceConfig(new DeviceConfig(this, db, m_logger))
{
Q_ASSERT(dts);
@@ -232,7 +230,7 @@ bool CnrHandler::init()
if (!m_db->select(m_channels))
{
ERROR_LOG(m_logger) << "Error while selecting cnr channels from db";
ERROR_LOG() << "Error while selecting cnr channels from db";
return false;
}
@@ -243,7 +241,7 @@ bool CnrHandler::init()
QVector<AvmCnrConfig> cnrConfigs;
if (!m_db->select(cnrConfigs))
{
ERROR_LOG(m_logger) << "Error while selecting CNR configs from db";
ERROR_LOG() << "Error while selecting CNR configs from db";
return false;
}
@@ -277,7 +275,7 @@ void CnrHandler::onRemoveCnrConfigRequest(const rti::core::SampleIdentity &cooki
{
auto ret = removeCnrConfig(request);
if (ret.error())
WARNING_LOG(m_logger) << ret();
WARNING_LOG() << ret();
m_fts->removeCnrConfigReply(cookie, ret);
}
@@ -286,19 +284,19 @@ void CnrHandler::onModifyCnrConfigRequest(const rti::core::SampleIdentity &cooki
{
auto ret = (request.id() < 1 ? createCnrConfig(request) : modifyCnrConfig(request));
if (ret.error())
WARNING_LOG(m_logger) << ret();
WARNING_LOG() << ret();
m_fts->modifyCnrConfigReply(cookie, ret);
}
void CnrHandler::onRadioStationAdded(int id, const QString &name, const QString &hostname)
{
DEBUG_LOG(m_logger) << "Adding radio station with id " << id << " (" << name << ") and hostname '" << hostname << "'";
DEBUG_LOG() << "Adding radio station with id " << id << " (" << name << ") and hostname '" << hostname << "'";
auto it = m_cnrRadioStations.find(id);
if (it != m_cnrRadioStations.end() && it.value() == hostname)
return;
if (hostname.isEmpty())
{
WARNING_LOG(m_logger) << "Radio station with id " << id << " (" << name << ") has an empty hostname - ignoring!";
WARNING_LOG() << "Radio station with id " << id << " (" << name << ") has an empty hostname - ignoring!";
return;
}
m_cnrRadioStations[id] = hostname;
@@ -307,7 +305,7 @@ void CnrHandler::onRadioStationAdded(int id, const QString &name, const QString
void CnrHandler::onRadioStationRemoved(int id)
{
DEBUG_LOG(m_logger) << "Removing radio station with id " << id;
DEBUG_LOG() << "Removing radio station with id " << id;
auto it = m_cnrRadioStations.find(id);
if (it == m_cnrRadioStations.end())
return;
@@ -349,7 +347,7 @@ void CnrHandler::onDbDeleteAvmCnrConfig(const QVariant &id)
if (!m_cache.contains(configId))
return; // the notification was a result of our own removal of the entry
DEBUG_LOG(m_logger) << "DB deleted AvmCnrConfig with id: " << configId;
DEBUG_LOG() << "DB deleted AvmCnrConfig with id: " << configId;
removeCnrConfig(Core::RemoveElementRequest(configId));
}
@@ -387,7 +385,7 @@ void CnrHandler::reevalutate()
{
auto reply = modifyCnrConfig(toRequest(cnrConfig));
if (reply.error())
ERROR_LOG(m_logger) << reply();
ERROR_LOG() << reply();
}
trans.commit();
@@ -560,7 +558,7 @@ bool CnrHandler::isNameUnique(const std::string &name, const boost::optional<int
*/
Core::FunctionReplyObject CnrHandler::createCnrConfig(const ModifyCnrConfigRequest &request, const boost::optional<int32_t> &dbId)
{
DEBUG_LOG(m_logger) << "CreateCnrConfigRequest: " << request;
DEBUG_LOG() << "CreateCnrConfigRequest: " << request;
auto reply = validateRequest(request);
if (reply.error())
@@ -588,7 +586,7 @@ Core::FunctionReplyObject CnrHandler::createCnrConfig(const ModifyCnrConfigReque
Core::FunctionReplyObject CnrHandler::modifyCnrConfig(const ModifyCnrConfigRequest &request)
{
DEBUG_LOG(m_logger) << "ModifyCnrConfigRequest: " << request;
DEBUG_LOG() << "ModifyCnrConfigRequest: " << request;
auto reply = validateRequest(request);
if (reply.error())
@@ -632,7 +630,7 @@ Core::FunctionReplyObject CnrHandler::modifyCnrConfig(const ModifyCnrConfigReque
Core::FunctionReplyObject CnrHandler::removeCnrConfig(const Core::RemoveElementRequest &request)
{
DEBUG_LOG(m_logger) << "RemoveCnrConfigRequest: " << request;
DEBUG_LOG() << "RemoveCnrConfigRequest: " << request;
int32_t configId = request.id();
Core::FunctionReplyObject reply(configId);