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
@@ -21,7 +21,6 @@ HandlerGroup::HandlerGroup(MainHandler *mainHandler)
|
||||
, Interface::Fts::GroupCreateRequestHandler(mainHandler->fts())
|
||||
, Interface::Fts::GroupRemoveRequestHandler(mainHandler->fts())
|
||||
, m_mainHandler(mainHandler)
|
||||
, m_logger(getLogger("HandlerGroup"))
|
||||
{}
|
||||
|
||||
HandlerGroup::~HandlerGroup()
|
||||
@@ -54,7 +53,7 @@ bool HandlerGroup::init()
|
||||
};
|
||||
if (!m_mainHandler->db()->select(cbGroupGroup))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error reading data from database!";
|
||||
ERROR_LOG() << "Error reading data from database!";
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -65,7 +64,7 @@ bool HandlerGroup::init()
|
||||
};
|
||||
if (!m_mainHandler->db()->select(cbAclAllow))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error reading data from database!";
|
||||
ERROR_LOG() << "Error reading data from database!";
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -76,7 +75,7 @@ bool HandlerGroup::init()
|
||||
};
|
||||
if (!m_mainHandler->db()->select(cbAclDeny))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error reading data from database!";
|
||||
ERROR_LOG() << "Error reading data from database!";
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -93,7 +92,7 @@ bool HandlerGroup::init()
|
||||
if (ret.error())
|
||||
{
|
||||
delete ifs;
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
ERROR_LOG() << ret();
|
||||
bRet = false;
|
||||
return;
|
||||
}
|
||||
@@ -101,19 +100,19 @@ bool HandlerGroup::init()
|
||||
};
|
||||
if (!m_mainHandler->db()->select(cbGroup) || !bRet)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error reading data from database!";
|
||||
ERROR_LOG() << "Error reading data from database!";
|
||||
return false;
|
||||
}
|
||||
|
||||
DEBUG_LOG(m_logger) << "m_exeObjMap.size() = " << m_groupObjMap.size();
|
||||
INFO_LOG(m_logger) << "Handler Group initialized";
|
||||
DEBUG_LOG() << "m_exeObjMap.size() = " << m_groupObjMap.size();
|
||||
INFO_LOG() << "Handler Group initialized";
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void HandlerGroup::updateRolePresetId(const int operatorId, const int rolePresetId)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "updateRolePresetId "
|
||||
DEBUG_LOG() << "updateRolePresetId "
|
||||
<< " operatorId=" << operatorId
|
||||
<< " rolePresetId=" << rolePresetId;
|
||||
m_mainHandler->getHandlerOperator()->operatorModifyRolePresetId( operatorId, rolePresetId);
|
||||
@@ -140,12 +139,12 @@ Core::FunctionReplyObject HandlerGroup::changeMembership(const OperatorManagemen
|
||||
void HandlerGroup::onGroupChangeMembershipsRequest(const rti::core::SampleIdentity &cookie,
|
||||
const GroupChangeMembersRequest &request)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onGroupChangeMembershipsRequest " << request;
|
||||
DEBUG_LOG() << "onGroupChangeMembershipsRequest " << request;
|
||||
Core::FunctionReplyObject ret = changeMembership(request);
|
||||
if (request.operatorId().is_set() && request.rolePresetId().is_set())
|
||||
updateRolePresetId(request.operatorId().get(), request.rolePresetId().get());
|
||||
if (ret.error())
|
||||
WARNING_LOG(m_logger) << ret();
|
||||
WARNING_LOG() << ret();
|
||||
m_mainHandler->fts()->groupChangeMembershipsReply(cookie, ret);
|
||||
}
|
||||
|
||||
@@ -177,10 +176,10 @@ Core::FunctionReplyObject HandlerGroup::create(const GroupCreateRequest &request
|
||||
void HandlerGroup::onGroupCreateRequest(const rti::core::SampleIdentity &cookie,
|
||||
const GroupCreateRequest &request)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onGroupCreateRequest" << request;
|
||||
DEBUG_LOG() << "onGroupCreateRequest" << request;
|
||||
Core::FunctionReplyObject ret = create(request);
|
||||
if (ret.error())
|
||||
WARNING_LOG(m_logger) << ret();
|
||||
WARNING_LOG() << ret();
|
||||
m_mainHandler->fts()->groupCreateReply(cookie, ret);
|
||||
}
|
||||
|
||||
@@ -208,7 +207,7 @@ Core::FunctionReplyObject HandlerGroup::changeName(const OperatorManagement::Gro
|
||||
void HandlerGroup::onGroupChangeNameRequest(const rti::core::SampleIdentity &cookie,
|
||||
const GroupChangeNameRequest &request)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onGroupChangeNameRequest" << request;
|
||||
DEBUG_LOG() << "onGroupChangeNameRequest" << request;
|
||||
|
||||
Core::FunctionReplyObject ret;
|
||||
ObjectGroup *ifs = m_groupObjMap.value(request.id());
|
||||
@@ -260,10 +259,10 @@ Core::FunctionReplyObject HandlerGroup::remove(const Core::RemoveElementRequest
|
||||
void HandlerGroup::onGroupRemoveRequest(const rti::core::SampleIdentity &cookie,
|
||||
const Core::RemoveElementRequest &request)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onGroupRemoveRequest" << request;
|
||||
DEBUG_LOG() << "onGroupRemoveRequest" << request;
|
||||
Core::FunctionReplyObject ret = remove(request);
|
||||
if (ret.error())
|
||||
WARNING_LOG(m_logger) << ret();
|
||||
WARNING_LOG() << ret();
|
||||
m_mainHandler->fts()->groupRemoveReply(cookie, ret);
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user