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
-2
@@ -22,8 +22,6 @@ public:
|
||||
AbstractEventFilter *createFilter() const override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -28,8 +28,6 @@ public:
|
||||
QWidget *widget() override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -21,8 +21,6 @@ public:
|
||||
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-3
@@ -27,9 +27,6 @@ public:
|
||||
|
||||
private:
|
||||
BiteMessageFilter *m_filter{nullptr};
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -27,8 +27,6 @@ private:
|
||||
void updateFilterString() override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -26,8 +26,6 @@ public:
|
||||
void addItemInfoRows(QFormLayout *) override {}
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -22,8 +22,6 @@ public:
|
||||
AbstractEventFilter *createFilter() const override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -28,8 +28,6 @@ public:
|
||||
QWidget *widget() override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -21,8 +21,6 @@ public:
|
||||
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-3
@@ -35,9 +35,6 @@ public:
|
||||
|
||||
private:
|
||||
CameraVideoFilter *m_filter{nullptr};
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
+6
-6
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
-3
@@ -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;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
+1
-1
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
-2
@@ -31,8 +31,6 @@ public:
|
||||
private:
|
||||
int m_mainStructureElementId;
|
||||
QString m_streamName;
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-3
@@ -29,9 +29,6 @@ public:
|
||||
|
||||
private:
|
||||
CrossBorderlineFilter *m_filter{nullptr};
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -24,8 +24,6 @@ private:
|
||||
void updateFilterString() override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
+1
-1
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
-2
@@ -26,8 +26,6 @@ public:
|
||||
void addItemInfoRows(QFormLayout *form) override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -22,8 +22,6 @@ public:
|
||||
AbstractEventFilter *createFilter() const override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -28,8 +28,6 @@ public:
|
||||
QWidget *widget() override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -21,8 +21,6 @@ public:
|
||||
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -22,8 +22,6 @@ public:
|
||||
AbstractEventFilter *createFilter() const override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -28,8 +28,6 @@ public:
|
||||
QWidget *widget() override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -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;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -22,8 +22,6 @@ public:
|
||||
AbstractEventFilter *createFilter() const override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -26,8 +26,6 @@ public:
|
||||
QWidget *widget() override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -21,8 +21,6 @@ public:
|
||||
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -22,8 +22,6 @@ public:
|
||||
AbstractEventFilter *createFilter() const override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -26,8 +26,6 @@ public:
|
||||
QWidget *widget() override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -21,8 +21,6 @@ public:
|
||||
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -22,8 +22,6 @@ public:
|
||||
AbstractEventFilter *createFilter() const override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -25,8 +25,6 @@ public:
|
||||
QStringList attributeNames() const override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -21,8 +21,6 @@ public:
|
||||
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -22,8 +22,6 @@ public:
|
||||
AbstractEventFilter *createFilter() const override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -26,8 +26,6 @@ public:
|
||||
QWidget *widget() override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -21,8 +21,6 @@ public:
|
||||
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -26,8 +26,6 @@ public:
|
||||
AbstractEventFilter *createFilter() const override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -28,8 +28,6 @@ public:
|
||||
QWidget *widget() override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -21,8 +21,6 @@ public:
|
||||
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-3
@@ -32,9 +32,6 @@ public:
|
||||
|
||||
private:
|
||||
FireEventFilter *m_filter{nullptr};
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
+1
-1
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
-3
@@ -45,9 +45,6 @@ private:
|
||||
QMap<int, QString> m_chargeTypes;
|
||||
|
||||
std::shared_ptr<ProjectDataManagement::Interface::Dtc> m_pdmDtc{nullptr};
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
+1
-1
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
-2
@@ -26,8 +26,6 @@ public:
|
||||
void addItemInfoRows(QFormLayout *form) override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -26,8 +26,6 @@ public:
|
||||
AbstractEventFilter *createFilter() const override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -28,8 +28,6 @@ public:
|
||||
QWidget *widget() override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -21,8 +21,6 @@ public:
|
||||
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -26,8 +26,6 @@ public:
|
||||
AbstractEventFilter *createFilter() const override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -28,8 +28,6 @@ public:
|
||||
QWidget *widget() override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -21,8 +21,6 @@ public:
|
||||
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -26,8 +26,6 @@ public:
|
||||
AbstractEventFilter *createFilter() const override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -28,8 +28,6 @@ public:
|
||||
QWidget *widget() override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -21,8 +21,6 @@ public:
|
||||
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-3
@@ -35,9 +35,6 @@ public:
|
||||
|
||||
private:
|
||||
HitFilter *m_filter{nullptr};
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
+2
-2
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
-2
@@ -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;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
+1
-1
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
-2
@@ -26,8 +26,6 @@ public:
|
||||
void addItemInfoRows(QFormLayout *form) override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -26,8 +26,6 @@ public:
|
||||
AbstractEventFilter *createFilter() const override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -28,8 +28,6 @@ public:
|
||||
QWidget *widget() override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -21,8 +21,6 @@ public:
|
||||
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-3
@@ -38,9 +38,6 @@ public:
|
||||
|
||||
private:
|
||||
HitBuildingFilter *m_filter{nullptr};
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
+5
-5
@@ -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()
|
||||
|
||||
-2
@@ -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;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
+1
-1
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
-2
@@ -29,8 +29,6 @@ public:
|
||||
|
||||
private:
|
||||
int m_mainStructureElementId;
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -26,8 +26,6 @@ public:
|
||||
AbstractEventFilter *createFilter() const override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -28,8 +28,6 @@ public:
|
||||
QWidget *widget() override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -21,8 +21,6 @@ public:
|
||||
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-3
@@ -33,9 +33,6 @@ public:
|
||||
|
||||
private:
|
||||
HitEffectSimulationFilter *m_filter{nullptr};
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
+2
-2
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
-2
@@ -50,8 +50,6 @@ private:
|
||||
QMap<int, QString> m_chargeTypes;
|
||||
|
||||
std::shared_ptr<ProjectDataManagement::Interface::Dtc> m_pdmDtc{nullptr};
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
+1
-1
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
-2
@@ -26,8 +26,6 @@ public:
|
||||
void addItemInfoRows(QFormLayout *form) override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -26,8 +26,6 @@ public:
|
||||
AbstractEventFilter *createFilter() const override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -28,8 +28,6 @@ public:
|
||||
QWidget *widget() override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -21,8 +21,6 @@ public:
|
||||
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -26,8 +26,6 @@ public:
|
||||
AbstractEventFilter *createFilter() const override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -28,8 +28,6 @@ public:
|
||||
QWidget *widget() override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -21,8 +21,6 @@ public:
|
||||
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -26,8 +26,6 @@ public:
|
||||
AbstractEventFilter *createFilter() const override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -28,8 +28,6 @@ public:
|
||||
QWidget *widget() override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -21,8 +21,6 @@ public:
|
||||
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -26,8 +26,6 @@ public:
|
||||
AbstractEventFilter *createFilter() const override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -28,8 +28,6 @@ public:
|
||||
QWidget *widget() override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -21,8 +21,6 @@ public:
|
||||
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -26,8 +26,6 @@ public:
|
||||
AbstractEventFilter *createFilter() const override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -28,8 +28,6 @@ public:
|
||||
QWidget *widget() override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -21,8 +21,6 @@ public:
|
||||
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -26,8 +26,6 @@ public:
|
||||
AbstractEventFilter *createFilter() const override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -28,8 +28,6 @@ public:
|
||||
QWidget *widget() override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -21,8 +21,6 @@ public:
|
||||
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -26,8 +26,6 @@ public:
|
||||
AbstractEventFilter *createFilter() const override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -28,8 +28,6 @@ public:
|
||||
QWidget *widget() override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -21,8 +21,6 @@ public:
|
||||
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-3
@@ -27,9 +27,6 @@ public:
|
||||
|
||||
private:
|
||||
ManipulationFilter *m_filter{nullptr};
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -27,8 +27,6 @@ private:
|
||||
void updateFilterString() override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -26,8 +26,6 @@ public:
|
||||
void addItemInfoRows(QFormLayout *form) override {}
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-3
@@ -37,9 +37,6 @@ public:
|
||||
|
||||
private:
|
||||
MarkerFilter *m_filter{nullptr};
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
+1
-1
@@ -39,7 +39,7 @@ bool MarkerFilter::init(std::shared_ptr<OperatorManagement::Interface::Dtc> opmD
|
||||
{
|
||||
if (!opmDtc)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Unable to load Users/Operators from OPM-DTC";
|
||||
ERROR_LOG() << "Unable to load Users/Operators from OPM-DTC";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
Loaded 100 of 2785 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user