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/Common/LtsSession/lts_session_lock_handler.cpp
+25 -25
View File
@@ -15,42 +15,42 @@ TopicLockHandler::TopicLockHandler()
: QObject()
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("LtsSession.TopicLockHandler"))
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
TopicLockHandler::~TopicLockHandler()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
bool TopicLockHandler::init(const std::shared_ptr<Core::Interface::Ftc> &coreFtc,
int exerciseId)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
if (coreFtc == nullptr)
return false;
coreFtc->enableAll();
m_exerciseId = exerciseId;
m_coreFtc = coreFtc;
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
return true;
}
bool TopicLockHandler::lock()
{
INFO_LOG(m_logger) << "LOCK " << m_topicInfo.topicName();
TRACE_LOG(m_logger) << LOGFUNCTION << objStateAsString();
INFO_LOG() << "LOCK " << m_topicInfo.topicName();
TRACE_LOG() << Q_FUNC_INFO << objStateAsString();
if (m_coreFtc == nullptr)
return false;
if (m_locked)
{
ERROR_LOG(m_logger) << LOGFUNCTION << ": called lock while still locked! " << m_lockEntityId;
ERROR_LOG() << Q_FUNC_INFO << ": called lock while still locked! " << m_lockEntityId;
Q_ASSERT(false);
return false;
}
@@ -71,13 +71,13 @@ bool TopicLockHandler::lock()
{
const Core::TryLockEntityReply reply(m_coreFtc->tryLockEntityRequest(req));
TRACE_LOG(m_logger) << LOGFUNCTION << ": Reply received - state=" << objStateAsString()
TRACE_LOG() << Q_FUNC_INFO << ": Reply received - state=" << objStateAsString()
<< " - reply=" << reply;
if (reply.alreadyLocked().is_set())
{
const Core::LockEntityError &alreadyLocked = reply.alreadyLocked().get();
INFO_LOG(m_logger) << LOGFUNCTION << ": Topic already locked by ws " << alreadyLocked.workstationName() << " and op " << alreadyLocked.operatorName();
INFO_LOG() << Q_FUNC_INFO << ": Topic already locked by ws " << alreadyLocked.workstationName() << " and op " << alreadyLocked.operatorName();
@@ -88,7 +88,7 @@ bool TopicLockHandler::lock()
}
else
{
DEBUG_LOG(m_logger) << LOGFUNCTION << ": Topic NOT already locked";
DEBUG_LOG() << Q_FUNC_INFO << ": Topic NOT already locked";
Q_ASSERT(reply.id() > 0);
m_locked = true;
@@ -97,7 +97,7 @@ bool TopicLockHandler::lock()
}
catch (const std::runtime_error &err)
{
ERROR_LOG(m_logger) << LOGFUNCTION << ": Failed to lock topic! " << err.what();
ERROR_LOG() << Q_FUNC_INFO << ": Failed to lock topic! " << err.what();
Q_ASSERT(false);
return false;
}
@@ -107,15 +107,15 @@ bool TopicLockHandler::lock()
bool TopicLockHandler::unlock()
{
INFO_LOG(m_logger) << "UNLOCK " << m_topicInfo.topicName() << " - " << m_lockEntityId;
TRACE_LOG(m_logger) << LOGFUNCTION << objStateAsString();
INFO_LOG() << "UNLOCK " << m_topicInfo.topicName() << " - " << m_lockEntityId;
TRACE_LOG() << Q_FUNC_INFO << objStateAsString();
if (m_coreFtc == nullptr)
return false;
if (!m_locked)
{
ERROR_LOG(m_logger) << LOGFUNCTION << ": Tried to unlock while unlocked.. " << objStateAsString();
ERROR_LOG() << Q_FUNC_INFO << ": Tried to unlock while unlocked.. " << objStateAsString();
Q_ASSERT(false);
return false;
}
@@ -132,14 +132,14 @@ bool TopicLockHandler::unlock()
{
const auto reply(m_coreFtc->tryUnlockEntityRequest(req));
TRACE_LOG(m_logger) << LOGFUNCTION << ": Reply received - state=" << objStateAsString()
TRACE_LOG() << Q_FUNC_INFO << ": Reply received - state=" << objStateAsString()
<< " - reply=" << reply;
DEBUG_LOG(m_logger) << LOGFUNCTION << ": Topic unlocked!";
DEBUG_LOG() << Q_FUNC_INFO << ": Topic unlocked!";
}
catch (const std::runtime_error &err)
{
ERROR_LOG(m_logger) << LOGFUNCTION << ": Failed to unlock topic! " << err.what();
ERROR_LOG() << Q_FUNC_INFO << ": Failed to unlock topic! " << err.what();
return false;
}
@@ -168,31 +168,31 @@ std::string TopicLockHandler::objStateAsString() const
bool TopicLockHandler::slotUnlock()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " slotUnlock" << objStateAsString();
TRACE_LOG() << Q_FUNC_INFO << " slotUnlock" << objStateAsString();
return unlock();
}
void TopicLockHandler::slotTryLock(const LtsWidgets::TopicInfo &topicInfo)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START " << objStateAsString();
TRACE_LOG() << Q_FUNC_INFO << " START " << objStateAsString();
m_topicInfo = topicInfo;
if (m_topicInfo.topicName().isEmpty() || !topicInfo.isValid())
{
DEBUG_LOG(m_logger) << LOGFUNCTION << " no lockable topic, that's okay";
DEBUG_LOG() << Q_FUNC_INFO << " no lockable topic, that's okay";
return;
}
lock();
TRACE_LOG(m_logger) << LOGFUNCTION << " END " << objStateAsString();
TRACE_LOG() << Q_FUNC_INFO << " END " << objStateAsString();
}
void TopicLockHandler::slotFinalize()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START " << objStateAsString();
TRACE_LOG() << Q_FUNC_INFO << " START " << objStateAsString();
if (m_locked)
{
@@ -201,7 +201,7 @@ void TopicLockHandler::slotFinalize()
deleteLater();
TRACE_LOG(m_logger) << LOGFUNCTION << " END " << objStateAsString();
TRACE_LOG() << Q_FUNC_INFO << " END " << objStateAsString();
}