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
@@ -7,7 +7,7 @@
|
||||
#include "lts_session_data_dds.h"
|
||||
#include "lts_session_manager.h"
|
||||
|
||||
#include <LtsSession/ltssession_export.h>
|
||||
#include "ltssession_export.h"
|
||||
#include <LtsWidgets/lts_base.h>
|
||||
#include <QtCore/qobjectdefs.h>
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include <LtsSession/ltssessiondata_export.h>
|
||||
#include "ltssessiondata_export.h"
|
||||
#include <ProjectConfig/project_defines.h>
|
||||
#include <LtsAppDescriptor/lts_app_descriptor.h>
|
||||
|
||||
|
||||
@@ -341,7 +341,7 @@ bool LtsSessionDataDds::initInternal()
|
||||
{
|
||||
if (!m_ddsConnector || !m_ddsConnector->init(m_qosFileList))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "DDS connector could not be initialized - session aborted!";
|
||||
ERROR_LOG() << "DDS connector could not be initialized - session aborted!";
|
||||
m_ddsConnector = nullptr;
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include <Common/ProjectConfig/project_defines.h>
|
||||
#include <LtsSession/ltssessiondatadds_export.h>
|
||||
#include "ltssessiondatadds_export.h"
|
||||
|
||||
|
||||
namespace DataPluginBase { class Interface; }
|
||||
@@ -123,7 +123,7 @@ public:
|
||||
if ( bEnableAll && !member->enableAll())
|
||||
{
|
||||
member = nullptr;
|
||||
ERROR_LOG(m_logger) << "Error initializing dtc/ftc for service " << T::identifier();
|
||||
ERROR_LOG() << "Error initializing dtc/ftc for service " << T::identifier();
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
@@ -138,7 +138,7 @@ public:
|
||||
{
|
||||
dtc = nullptr;
|
||||
ftc = nullptr;
|
||||
ERROR_LOG(m_logger) << "Error initializing dtc/ftc for service " << T::identifier();
|
||||
ERROR_LOG() << "Error initializing dtc/ftc for service " << T::identifier();
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
@@ -157,7 +157,7 @@ public:
|
||||
}
|
||||
}
|
||||
val.reset();
|
||||
DEBUG_LOG(m_logger) << "Trying to load dtc " << typeid(T).name() << " - " << typeid(S).name() << " failed!"
|
||||
DEBUG_LOG() << "Trying to load dtc " << typeid(T).name() << " - " << typeid(S).name() << " failed!"
|
||||
<< ", m_dataPluginInterfaces.size() = " << m_dataPluginInterfaces.size() << " - " << this;
|
||||
return false;
|
||||
}
|
||||
@@ -176,7 +176,7 @@ public:
|
||||
}
|
||||
}
|
||||
val.reset();
|
||||
DEBUG_LOG(m_logger) << "Trying to load ftc " << typeid(T).name() << " - " << typeid(S).name() << " failed!"
|
||||
DEBUG_LOG() << "Trying to load ftc " << typeid(T).name() << " - " << typeid(S).name() << " failed!"
|
||||
<< ", m_dataPluginInterfaces.size() = " << m_dataPluginInterfaces.size() << " - " << this;
|
||||
return false;
|
||||
}
|
||||
@@ -198,7 +198,7 @@ public:
|
||||
}
|
||||
}
|
||||
val.reset();
|
||||
DEBUG_LOG(m_logger) << "Trying to load foreign data ifc " << typeid(T).name() << " - " << typeid(S).name() << " failed!"
|
||||
DEBUG_LOG() << "Trying to load foreign data ifc " << typeid(T).name() << " - " << typeid(S).name() << " failed!"
|
||||
<< ", m_dataPluginInterfaces.size() = " << m_dataPluginInterfaces.size() << " - " << this;
|
||||
return false;
|
||||
}
|
||||
@@ -220,7 +220,7 @@ public:
|
||||
return true;
|
||||
}
|
||||
val.reset();
|
||||
DEBUG_LOG(m_logger) << "Trying to load foreign data ifc " << typeid(S).name() << " failed!"
|
||||
DEBUG_LOG() << "Trying to load foreign data ifc " << typeid(S).name() << " failed!"
|
||||
<< ", m_guiPluginInterfaces.size() = " << m_guiPluginInterfaces.size() << " - " << this;
|
||||
return false;
|
||||
}
|
||||
@@ -238,7 +238,7 @@ public:
|
||||
return true;
|
||||
}
|
||||
val.reset();
|
||||
DEBUG_LOG(m_logger) << "Cannot find foreign gui ifc " << typeid(S).name() << " in " << toString();
|
||||
DEBUG_LOG() << "Cannot find foreign gui ifc " << typeid(S).name() << " in " << toString();
|
||||
|
||||
return false;
|
||||
}
|
||||
@@ -254,7 +254,7 @@ public:
|
||||
return true;
|
||||
}
|
||||
val.reset();
|
||||
DEBUG_LOG(m_logger) << "Trying to load foreign gui ifc #2 " << typeid(S).name() << " failed!"
|
||||
DEBUG_LOG() << "Trying to load foreign gui ifc #2 " << typeid(S).name() << " failed!"
|
||||
<< ", m_guiPluginInterfaces.size() = " << m_guiPluginInterfaces.size() << " - " << this;
|
||||
return false;
|
||||
}
|
||||
@@ -285,7 +285,6 @@ protected:
|
||||
QMap<QString, std::shared_ptr<GuiPluginBase::Interface>> m_initializeThesePlugins;
|
||||
Fetcher *m_fetcher;
|
||||
QStringList m_qosFileList;
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
|
||||
@@ -306,7 +305,6 @@ public:
|
||||
bool m_errors;
|
||||
QString m_caller;
|
||||
QString m_whatWillNotWork;
|
||||
NGL::INGLLogger &m_logger;
|
||||
bool m_optional;
|
||||
QString m_resultType;
|
||||
QString m_getterFunctionType;
|
||||
@@ -337,11 +335,11 @@ public:
|
||||
|
||||
if (m_optional)
|
||||
{
|
||||
INFO_LOG(m_logger) << msg.arg(m_caller, m_resultType, m_sessionDataDds->toString(), QStringLiteral("' - optional but %1 will not work").arg(m_whatWillNotWork));
|
||||
INFO_LOG() << msg.arg(m_caller, m_resultType, m_sessionDataDds->toString(), QStringLiteral("' - optional but %1 will not work").arg(m_whatWillNotWork));
|
||||
}
|
||||
else
|
||||
{
|
||||
ERROR_LOG(m_logger) << msg.arg(m_caller, m_resultType, m_sessionDataDds->toString(), QStringLiteral(" which is required"));
|
||||
ERROR_LOG() << msg.arg(m_caller, m_resultType, m_sessionDataDds->toString(), QStringLiteral(" which is required"));
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#pragma once
|
||||
#include <QObject>
|
||||
|
||||
#include <LtsSession/ltssession_export.h>
|
||||
#include "ltssession_export.h"
|
||||
#include <LtsWidgets/lts_dialog.h>
|
||||
#include <DDS/Core/core_ftc.h>
|
||||
|
||||
@@ -51,8 +51,6 @@ private:
|
||||
bool m_locked{false};
|
||||
bool m_askedForLock{false};
|
||||
bool m_deleteAfterAnswer{false};
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
|
||||
|
||||
@@ -108,7 +108,7 @@ LtsSession *LtsSessionManager::createSession(const DdsConnectionParams &connPara
|
||||
|
||||
if (session != nullptr)
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Tried to create a Session that already exists";
|
||||
WARNING_LOG() << "Tried to create a Session that already exists";
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
@@ -140,7 +140,7 @@ LtsSession *LtsSessionManager::createSession(const DdsConnectionParams &connPara
|
||||
return;
|
||||
}
|
||||
|
||||
WARNING_LOG(m_logger) << "Previously deleted Session " << session->partitionId() << "/"
|
||||
WARNING_LOG() << "Previously deleted Session " << session->partitionId() << "/"
|
||||
<< session->partitionType() << " is still alive!";
|
||||
});
|
||||
#endif
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <LtsSession/ltssession_export.h>
|
||||
#include "ltssession_export.h"
|
||||
#include <LtsPluginManager/lts_plugin_loader.h>
|
||||
#include <LtsPluginManager/lts_plugin_manager.h>
|
||||
#include <Common/ProjectConfig/project_defines.h>
|
||||
@@ -86,8 +86,6 @@ private:
|
||||
QVector<LtsPluginManager::AppPluginInstance> m_guiPluginList;
|
||||
LtsAppDescriptor::App m_appId;
|
||||
bool m_headless;
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
private slots:
|
||||
void slotCloseSession();
|
||||
|
||||
|
||||
Reference in new issue
Block a user