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:
torstenandCopilot committed 2026-08-19 06:06:24 +02:00
1 parent 010f91928a
commit b774f4035c
2785 files changed
+18754 -18316

No files matched your search

@@ -31,7 +31,7 @@ ADD_INTERFACE_LIBRARY(TlnEventTimelineGuiPluginInterface
# Data Plugin Interface
#
# need top be shared due to signals/slots
NGL_ADD_LIBRARY(WS TlnDataPluginInterface SHARED tln_data_plugin_interface.h)
NGL_ADD_LIBRARY2(WS TlnDataPluginInterface SHARED tln_data_plugin_interface.h)
NGL_TARGET_LINK_LIBRARIES(TlnDataPluginInterface
Qt6::Core
svcEemCommon
@@ -134,7 +134,7 @@ TimelineDataProvider::TimelineDataProvider(int requestId, const QUrl &url,
realUrl.setQuery(query);
m_webSocketEem->open(realUrl);
DEBUG_LOG(m_logger) << "requesting data from EEM: " << realUrl.toString();
DEBUG_LOG() << "requesting data from EEM: " << realUrl.toString();
}
TimelineDataProvider::~TimelineDataProvider()
@@ -157,13 +157,13 @@ void TimelineDataProvider::textMessageFromEem(const QString &message)
{
if (message.isEmpty() || message == QStringLiteral("{}"))
{
DEBUG_LOG(m_logger) << "textMessageFromEem - finished";
DEBUG_LOG() << "textMessageFromEem - finished";
disconnectedFromEem();
return;
}
const QJsonDocument doc(QJsonDocument::fromJson(message.toUtf8()));
const QJsonArray arr = doc.array();
DEBUG_LOG(m_logger) << "textMessageFromEem - #events: " << arr.size();
DEBUG_LOG() << "textMessageFromEem - #events: " << arr.size();
m_eventData.reserve(m_eventData.size() + arr.size());
using namespace ExerciseEventManagement::Database;
std::transform(arr.begin(), arr.end(),
@@ -175,7 +175,7 @@ TimelineDataProviderInterface *ForeignInterfaceImpl::requestData(qint64 from, qi
{
if (!m_webSocketEem)
{
WARNING_LOG(m_logger) << "No connection to EEM - can not request data!";
WARNING_LOG() << "No connection to EEM - can not request data!";
return nullptr;
}
static int s_requestId = 0;
@@ -185,7 +185,7 @@ TimelineDataProviderInterface *ForeignInterfaceImpl::requestData(qint64 from, qi
connect(tldp, &TimelineDataProvider::finished, this, &ForeignInterfaceImpl::requestFinished);
connect(tldp, &TimelineDataProvider::destroyed, this, [this, curRequestId]() { m_pendingRequests.remove(curRequestId);});
m_pendingRequests[curRequestId] = tldp;
DEBUG_LOG(m_logger) << "add to m_pendingRequests: " << curRequestId << ", " << tldp;
DEBUG_LOG() << "add to m_pendingRequests: " << curRequestId << ", " << tldp;
return tldp;
}
@@ -208,26 +208,26 @@ void ForeignInterfaceImpl::connectToScm()
const QUrl scmUrl(QStringLiteral("ws://%1:%2")
.arg(NGL::Connections::hostName(NGL::Connections::eConnection::SCM_WEBSOCKET))
.arg(NGL::Connections::port(NGL::Connections::eConnection::SCM_WEBSOCKET)));
DEBUG_LOG(m_logger) << "Trying to connect to SCM at " << scmUrl.toString();
DEBUG_LOG() << "Trying to connect to SCM at " << scmUrl.toString();
m_webSocketScm->open(scmUrl);
}
void ForeignInterfaceImpl::connectedToScm()
{
DEBUG_LOG(m_logger) << "Connected to SCM...";
DEBUG_LOG() << "Connected to SCM...";
m_webSocketScm->sendTextMessage(QStringLiteral("{\"type\": \"servicePortsInformationRequest\",\"uuid\": \"7777\"}"));
}
void ForeignInterfaceImpl::textMessageFromScm(const QString &message)
{
DEBUG_LOG(m_logger) << "textMessageFromScm from scm: " << message;
DEBUG_LOG() << "textMessageFromScm from scm: " << message;
const QJsonDocument doc = QJsonDocument::fromJson(message.toUtf8());
const QJsonArray exercises = doc.object().value(QStringLiteral("data")).toArray();
for (const QJsonValue &valEx : exercises)
{
const QJsonObject &exercise = valEx.toObject();
const int exerciseId = exercise.value(QStringLiteral("exerciseId")).toInt();
DEBUG_LOG(m_logger) << "textMessageFromScm from scm - exerciseId " << exerciseId;
DEBUG_LOG() << "textMessageFromScm from scm - exerciseId " << exerciseId;
if (exerciseId != m_session->exerciseId())
continue;
@@ -237,7 +237,7 @@ void ForeignInterfaceImpl::textMessageFromScm(const QString &message)
{
const QJsonObject &service = valSvc.toObject();
const QString svcName = service.value(QStringLiteral("nameAbbrevation")).toString().toUpper();
DEBUG_LOG(m_logger) << "textMessageFromScm from scm - svcName " << svcName;
DEBUG_LOG() << "textMessageFromScm from scm - svcName " << svcName;
if (svcName != QStringLiteral("EEM"))
continue;
@@ -272,24 +272,24 @@ void ForeignInterfaceImpl::connectToEem()
this, &ForeignInterfaceImpl::textMessageFromEem);
QUrl url(eemUrl());
url.setPath(QStringLiteral("/live"));
DEBUG_LOG(m_logger) << "Trying to connect to EEM at " << url.toString();
DEBUG_LOG() << "Trying to connect to EEM at " << url.toString();
m_webSocketEem->open(url);
}
void ForeignInterfaceImpl::connectedToEem()
{
DEBUG_LOG(m_logger) << "Connected to EEM...";
DEBUG_LOG() << "Connected to EEM...";
}
void ForeignInterfaceImpl::disconnectedFromEem()
{
WARNING_LOG(m_logger) << "EEM connection closed - try to reconnect";
WARNING_LOG() << "EEM connection closed - try to reconnect";
QTimer::singleShot(500, this, &ForeignInterfaceImpl::connectToScm);
}
void ForeignInterfaceImpl::textMessageFromEem(const QString &message)
{
TRACE_LOG(m_logger) << "textMessageFromEem: " << message;
TRACE_LOG() << "textMessageFromEem: " << message;
const QJsonObject obj(QJsonDocument::fromJson(message.toUtf8()).object());
using namespace ExerciseEventManagement::Database;
@@ -303,16 +303,16 @@ void ForeignInterfaceImpl::requestFinished()
TimelineDataProvider *tldp = qobject_cast<TimelineDataProvider *>(sender());
if (!tldp)
{
WARNING_LOG(m_logger) << "requestFinished without valid sender";
WARNING_LOG() << "requestFinished without valid sender";
return;
}
auto it = m_pendingRequests.find(tldp->requestId());
if (it == m_pendingRequests.end())
{
WARNING_LOG(m_logger) << "requestFinished but request not found in pending requests: " << tldp->requestId() << ", " << tldp;
WARNING_LOG() << "requestFinished but request not found in pending requests: " << tldp->requestId() << ", " << tldp;
return;
}
DEBUG_LOG(m_logger) << "emit requestedDataAvailable for " << tldp->requestId() << ", #events: " << tldp->eventData().size() << ", " << tldp;
DEBUG_LOG() << "emit requestedDataAvailable for " << tldp->requestId() << ", #events: " << tldp->eventData().size() << ", " << tldp;
emit requestedDataAvailable(it.value());
it.value()->deleteLater();
m_pendingRequests.erase(it);
@@ -45,8 +45,6 @@ public:
private:
std::shared_ptr<TimeLineManagement::ForeignDataInterface> m_foreign;
NGL::INGLLogger &m_logger;
};
@@ -78,7 +76,6 @@ private:
bool m_bFinshed;
qint64 m_requestMin;
qint64 m_requestMax;
NGL::INGLLogger &m_logger;
};
class ForeignInterfaceImpl final : public ForeignDataInterface
@@ -118,7 +115,6 @@ private:
QWebSocket *m_webSocketEem;
QTimer *m_liveHistoryBufferTimer;
quint16 m_eemPort;
NGL::INGLLogger &m_logger;
};
}
@@ -22,8 +22,6 @@ public:
AbstractEventFilter *createFilter() const override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -28,8 +28,6 @@ public:
QWidget *widget() override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -21,8 +21,6 @@ public:
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -27,9 +27,6 @@ public:
private:
BiteMessageFilter *m_filter{nullptr};
NGL::INGLLogger &m_logger;
};
}
@@ -27,8 +27,6 @@ private:
void updateFilterString() override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -26,8 +26,6 @@ public:
void addItemInfoRows(QFormLayout *) override {}
private:
NGL::INGLLogger &m_logger;
};
}
@@ -22,8 +22,6 @@ public:
AbstractEventFilter *createFilter() const override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -28,8 +28,6 @@ public:
QWidget *widget() override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -21,8 +21,6 @@ public:
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -35,9 +35,6 @@ public:
private:
CameraVideoFilter *m_filter{nullptr};
NGL::INGLLogger &m_logger;
};
}
@@ -70,7 +70,7 @@ bool CameraVideoFilter::init(
{
if (!ismDtc)
{
ERROR_LOG(m_logger) << "Unable to load MainStructureElement IDs from ISM-DTC";
ERROR_LOG() << "Unable to load MainStructureElement IDs from ISM-DTC";
return false;
}
@@ -86,7 +86,7 @@ bool CameraVideoFilter::init(
{
if (!m_avmDtc || !m_avmDataIfc || !m_avmDataIfc->hasAvsSession() || !m_avmDataIfc->menus())
{
ERROR_LOG(m_logger) << "Unable to load Video Menus";
ERROR_LOG() << "Unable to load Video Menus";
return false;
}
@@ -109,7 +109,7 @@ bool CameraVideoFilter::init(
if (newActiveVideoMenu == m_activeVideoMenu)
return;
DEBUG_LOG(m_logger) << "Changed active video menu from: " << m_activeVideoMenu << ", to: " << newActiveVideoMenu;
DEBUG_LOG() << "Changed active video menu from: " << m_activeVideoMenu << ", to: " << newActiveVideoMenu;
m_activeVideoMenu = newActiveVideoMenu;
@@ -375,7 +375,7 @@ QStringList CameraVideoFilter::getInternalStreamNamesBySelectedStreams() const
if (!m_avmDtc)
{
ERROR_LOG(m_logger) << "Unable to get internal stream names (avm dtc missing)";
ERROR_LOG() << "Unable to get internal stream names (avm dtc missing)";
return {};
}
@@ -447,7 +447,7 @@ void CameraVideoFilter::onMainStructureElementChanged(const InfrastructureManage
if (parseError.error != QJsonParseError::NoError)
{
INFO_LOG(m_logger) << "Could not parse JSON props of building with ID "
INFO_LOG() << "Could not parse JSON props of building with ID "
<< data.id()
<< ". Reason: "
<< parseError.errorString()
@@ -493,7 +493,7 @@ void CameraVideoFilter::onStreamListReceived(const QMap<QString, QString> &mapIn
{
if (!m_avmDtc)
{
ERROR_LOG(m_logger) << "Unable to load Video Menus";
ERROR_LOG() << "Unable to load Video Menus";
return;
}
@@ -68,9 +68,6 @@ private:
std::shared_ptr<InfrastructureManagement::Interface::Dtc> m_ismDtc{nullptr};
std::shared_ptr<AudioVideoManagement::ForeignDataInterface> m_avmDataIfc;
std::shared_ptr<AudioVideoManagement::Interface::Dtc> m_avmDtc;
NGL::INGLLogger &m_logger;
};
}
@@ -53,7 +53,7 @@ void CameraVideoItem::addItemInfoRows(QFormLayout *form)
CameraVideoFilter *filter = static_cast<CameraVideoFilter *>(m_factory->filter());
if (!filter)
{
ERROR_LOG(m_logger) << "CameraVideoFilter unavailable";
ERROR_LOG() << "CameraVideoFilter unavailable";
return;
}
@@ -31,8 +31,6 @@ public:
private:
int m_mainStructureElementId;
QString m_streamName;
NGL::INGLLogger &m_logger;
};
}
@@ -29,9 +29,6 @@ public:
private:
CrossBorderlineFilter *m_filter{nullptr};
NGL::INGLLogger &m_logger;
};
}
@@ -24,8 +24,6 @@ private:
void updateFilterString() override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -62,7 +62,7 @@ void CrossBorderlineItem::addItemInfoRows(QFormLayout *form)
CrossBorderlineFilter *filter = static_cast<CrossBorderlineFilter *>(m_factory->filter());
if (!filter)
{
ERROR_LOG(m_logger) << "CrossBorderlineFilter unavailable";
ERROR_LOG() << "CrossBorderlineFilter unavailable";
return;
}
@@ -26,8 +26,6 @@ public:
void addItemInfoRows(QFormLayout *form) override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -22,8 +22,6 @@ public:
AbstractEventFilter *createFilter() const override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -28,8 +28,6 @@ public:
QWidget *widget() override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -21,8 +21,6 @@ public:
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -22,8 +22,6 @@ public:
AbstractEventFilter *createFilter() const override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -28,8 +28,6 @@ public:
QWidget *widget() override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -21,8 +21,6 @@ public:
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index, const LtsUtils::QPoint3D &position) const override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -22,8 +22,6 @@ public:
AbstractEventFilter *createFilter() const override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -26,8 +26,6 @@ public:
QWidget *widget() override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -21,8 +21,6 @@ public:
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -22,8 +22,6 @@ public:
AbstractEventFilter *createFilter() const override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -26,8 +26,6 @@ public:
QWidget *widget() override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -21,8 +21,6 @@ public:
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -22,8 +22,6 @@ public:
AbstractEventFilter *createFilter() const override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -25,8 +25,6 @@ public:
QStringList attributeNames() const override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -21,8 +21,6 @@ public:
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -22,8 +22,6 @@ public:
AbstractEventFilter *createFilter() const override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -26,8 +26,6 @@ public:
QWidget *widget() override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -21,8 +21,6 @@ public:
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -26,8 +26,6 @@ public:
AbstractEventFilter *createFilter() const override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -28,8 +28,6 @@ public:
QWidget *widget() override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -21,8 +21,6 @@ public:
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -32,9 +32,6 @@ public:
private:
FireEventFilter *m_filter{nullptr};
NGL::INGLLogger &m_logger;
};
}
@@ -35,7 +35,7 @@ bool FireEventFilter::init(std::shared_ptr<ProjectDataManagement::Interface::Dtc
{
if (!pdmDtc)
{
ERROR_LOG(m_logger) << "PDM-DTC is not running";
ERROR_LOG() << "PDM-DTC is not running";
return false;
}
@@ -45,9 +45,6 @@ private:
QMap<int, QString> m_chargeTypes;
std::shared_ptr<ProjectDataManagement::Interface::Dtc> m_pdmDtc{nullptr};
NGL::INGLLogger &m_logger;
};
}
@@ -58,7 +58,7 @@ void FireEventItem::addItemInfoRows(QFormLayout *form)
FireEventFilter *filter = static_cast<FireEventFilter *>(m_factory->filter());
if (!filter)
{
ERROR_LOG(m_logger) << "FireEventFilter unavailable";
ERROR_LOG() << "FireEventFilter unavailable";
return;
}
@@ -26,8 +26,6 @@ public:
void addItemInfoRows(QFormLayout *form) override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -26,8 +26,6 @@ public:
AbstractEventFilter *createFilter() const override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -28,8 +28,6 @@ public:
QWidget *widget() override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -21,8 +21,6 @@ public:
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -26,8 +26,6 @@ public:
AbstractEventFilter *createFilter() const override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -28,8 +28,6 @@ public:
QWidget *widget() override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -21,8 +21,6 @@ public:
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -26,8 +26,6 @@ public:
AbstractEventFilter *createFilter() const override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -28,8 +28,6 @@ public:
QWidget *widget() override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -21,8 +21,6 @@ public:
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -35,9 +35,6 @@ public:
private:
HitFilter *m_filter{nullptr};
NGL::INGLLogger &m_logger;
};
}
@@ -54,12 +54,12 @@ bool HitFilter::init(
if (!m_ppmDtc)
{
ERROR_LOG(m_logger) << "PPM-DTC is not running";
ERROR_LOG() << "PPM-DTC is not running";
return false;
}
if (!m_pdmDtc)
{
ERROR_LOG(m_logger) << "PDM-DTC is not running";
ERROR_LOG() << "PDM-DTC is not running";
return false;
}
@@ -63,8 +63,6 @@ private:
LtsSession::LtsSession *m_session { nullptr };
std::shared_ptr<ParticipantManagement::Interface::Dtc> m_ppmDtc;
std::shared_ptr<ProjectDataManagement::Interface::Dtc> m_pdmDtc;
NGL::INGLLogger &m_logger;
};
}
@@ -59,7 +59,7 @@ void HitItem::addItemInfoRows(QFormLayout *form)
HitFilter *filter = static_cast<HitFilter *>(m_factory->filter());
if (!filter)
{
ERROR_LOG(m_logger) << "HitFilter unavailable";
ERROR_LOG() << "HitFilter unavailable";
return;
}
@@ -26,8 +26,6 @@ public:
void addItemInfoRows(QFormLayout *form) override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -26,8 +26,6 @@ public:
AbstractEventFilter *createFilter() const override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -28,8 +28,6 @@ public:
QWidget *widget() override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -21,8 +21,6 @@ public:
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -38,9 +38,6 @@ public:
private:
HitBuildingFilter *m_filter{nullptr};
NGL::INGLLogger &m_logger;
};
}
@@ -63,19 +63,19 @@ bool HitBuildingFilter::init(
if (!m_ismDtc)
{
ERROR_LOG(m_logger) << "ISM-DTC is not running";
ERROR_LOG() << "ISM-DTC is not running";
return false;
}
if (!m_ppmDtc)
{
ERROR_LOG(m_logger) << "PPM-DTC is not running";
ERROR_LOG() << "PPM-DTC is not running";
return false;
}
if (!m_pdmDtc)
{
ERROR_LOG(m_logger) << "PDM-DTC is not running";
ERROR_LOG() << "PDM-DTC is not running";
return false;
}
@@ -228,7 +228,7 @@ QString HitBuildingFilter::getChargeTypeShortName(int id)
{
if(!m_pdmDtc)
{
ERROR_LOG(m_logger) << "Unable to load ChargeType IDs from PDM-DTC";
ERROR_LOG() << "Unable to load ChargeType IDs from PDM-DTC";
return {};
}
return m_pdmDtc->trChargeTypeShortName(id);
@@ -377,7 +377,7 @@ void HitBuildingFilter::onMainStructureElementChanged(const InfrastructureManage
if (parseError.error != QJsonParseError::NoError)
{
INFO_LOG(m_logger) << "Could not parse JSON props of building with ID "
INFO_LOG() << "Could not parse JSON props of building with ID "
<< data.id()
<< ". Reason: "
<< parseError.errorString()
@@ -69,8 +69,6 @@ private:
std::shared_ptr<InfrastructureManagement::Interface::Dtc> m_ismDtc{nullptr};
std::shared_ptr<ParticipantManagement::Interface::Dtc> m_ppmDtc{nullptr};
std::shared_ptr<ProjectDataManagement::Interface::Dtc> m_pdmDtc{nullptr};
NGL::INGLLogger &m_logger;
};
}
@@ -60,7 +60,7 @@ void HitBuildingItem::addItemInfoRows(QFormLayout *form)
HitBuildingFilter *filter = static_cast<HitBuildingFilter *>(m_factory->filter());
if (!filter)
{
ERROR_LOG(m_logger) << "HitBuildingFilter unavailable";
ERROR_LOG() << "HitBuildingFilter unavailable";
return;
}
@@ -29,8 +29,6 @@ public:
private:
int m_mainStructureElementId;
NGL::INGLLogger &m_logger;
};
}
@@ -26,8 +26,6 @@ public:
AbstractEventFilter *createFilter() const override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -28,8 +28,6 @@ public:
QWidget *widget() override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -21,8 +21,6 @@ public:
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -33,9 +33,6 @@ public:
private:
HitEffectSimulationFilter *m_filter{nullptr};
NGL::INGLLogger &m_logger;
};
}
@@ -45,7 +45,7 @@ bool HitEffectSimulationFilter::init(std::shared_ptr<ProjectDataManagement::Inte
if (!m_pdmDtc)
{
ERROR_LOG(m_logger) << "PDM-DTC is not running";
ERROR_LOG() << "PDM-DTC is not running";
return false;
}
@@ -84,7 +84,7 @@ bool HitEffectSimulationFilter::init(std::shared_ptr<ProjectDataManagement::Inte
}
catch (...)
{
ERROR_LOG(m_logger) << "Unable to load AesTypes from AES";
ERROR_LOG() << "Unable to load AesTypes from AES";
return false;
}
}
@@ -50,8 +50,6 @@ private:
QMap<int, QString> m_chargeTypes;
std::shared_ptr<ProjectDataManagement::Interface::Dtc> m_pdmDtc{nullptr};
NGL::INGLLogger &m_logger;
};
}
@@ -61,7 +61,7 @@ void HitEffectSimulationItem::addItemInfoRows(QFormLayout *form)
HitEffectSimulationFilter *filter = static_cast<HitEffectSimulationFilter *>(m_factory->filter());
if (!filter)
{
ERROR_LOG(m_logger) << "HitEffectSimulationFilter unavailable";
ERROR_LOG() << "HitEffectSimulationFilter unavailable";
return;
}
@@ -26,8 +26,6 @@ public:
void addItemInfoRows(QFormLayout *form) override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -26,8 +26,6 @@ public:
AbstractEventFilter *createFilter() const override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -28,8 +28,6 @@ public:
QWidget *widget() override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -21,8 +21,6 @@ public:
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -26,8 +26,6 @@ public:
AbstractEventFilter *createFilter() const override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -28,8 +28,6 @@ public:
QWidget *widget() override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -21,8 +21,6 @@ public:
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -26,8 +26,6 @@ public:
AbstractEventFilter *createFilter() const override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -28,8 +28,6 @@ public:
QWidget *widget() override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -21,8 +21,6 @@ public:
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -26,8 +26,6 @@ public:
AbstractEventFilter *createFilter() const override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -28,8 +28,6 @@ public:
QWidget *widget() override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -21,8 +21,6 @@ public:
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -26,8 +26,6 @@ public:
AbstractEventFilter *createFilter() const override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -28,8 +28,6 @@ public:
QWidget *widget() override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -21,8 +21,6 @@ public:
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -26,8 +26,6 @@ public:
AbstractEventFilter *createFilter() const override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -28,8 +28,6 @@ public:
QWidget *widget() override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -21,8 +21,6 @@ public:
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -26,8 +26,6 @@ public:
AbstractEventFilter *createFilter() const override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -28,8 +28,6 @@ public:
QWidget *widget() override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -21,8 +21,6 @@ public:
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
private:
NGL::INGLLogger &m_logger;
};
}
@@ -27,9 +27,6 @@ public:
private:
ManipulationFilter *m_filter{nullptr};
NGL::INGLLogger &m_logger;
};
}
@@ -27,8 +27,6 @@ private:
void updateFilterString() override;
private:
NGL::INGLLogger &m_logger;
};
}
Loaded 100 of 2785 files, more files were not shown because too many files have changed in this diff. Show more