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/Proxies/Buildings/BuildingControlUnit/ControlEffects/handeleffect.cpp
+8 -8
View File
@@ -61,22 +61,22 @@ void HandelEffect::handleEffect()
switch (m_currentAction->aclass)
{
case AC_Unset:
DEBUG_LOG(m_logger) << "---- This is unset ----";
DEBUG_LOG() << "---- This is unset ----";
break;
case AC_Standard:
{
DEBUG_LOG(m_logger) << "---- This is a standard Action ----";
DEBUG_LOG() << "---- This is a standard Action ----";
if (!m_currentAction->url.isEmpty())
{
DEBUG_LOG(m_logger) << "---- emit newHttpRequest(a->url):" << m_currentAction->url.toString();
DEBUG_LOG() << "---- emit newHttpRequest(a->url):" << m_currentAction->url.toString();
emit newHttpRequest(m_currentAction->url);
}
break;
}
case AC_Repeat:
{
DEBUG_LOG(m_logger) << "---- This is a Repeat Action";
DEBUG_LOG() << "---- This is a Repeat Action";
const RepeatAction *ra = static_cast<const RepeatAction *>(m_currentAction);
HandelEffect *he = new HandelEffect(this);
@@ -92,7 +92,7 @@ void HandelEffect::handleEffect()
case AC_Pause:
{
const PauseAction *pa = static_cast<const PauseAction *>(m_currentAction);
DEBUG_LOG(m_logger) << "---- This is a Pause Action Pause=" << pa->pause
DEBUG_LOG() << "---- This is a Pause Action Pause=" << pa->pause
<< " comment=" << pa->comment;
QTimer::singleShot(pa->pause, this, &HandelEffect::handleEffect);
@@ -102,11 +102,11 @@ void HandelEffect::handleEffect()
}
case AC_Bsm:
{
DEBUG_LOG(m_logger) << "---- This is a Bsm Action ";
DEBUG_LOG() << "---- This is a Bsm Action ";
const BsmAction *ba = static_cast<const BsmAction*>(m_currentAction);
if (!ba->isNull())
{
DEBUG_LOG(m_logger) << "emit triggerAllFlashlights ------ atype=" << m_currentAction->atype
DEBUG_LOG() << "emit triggerAllFlashlights ------ atype=" << m_currentAction->atype
<< " pause=" << ba->pause
<< " choplength=" << ba->choplength
<< " pulses=" << ba->pulses
@@ -120,7 +120,7 @@ void HandelEffect::handleEffect()
default:
break;
}
DEBUG_LOG(m_logger) << "--- End Action ";
DEBUG_LOG() << "--- End Action ";
QTimer::singleShot(0, this, &HandelEffect::handleEffect);
qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/ControlEffects/handeleffects.cpp
+33 -33
View File
@@ -22,7 +22,7 @@ HandelEffects::HandelEffects(QObject *parent, const QString &loggerchannel)
, m_getRelayStateTimer(new QTimer(this))
, m_logger(getLogger(QStringLiteral("HandelEffects.") + loggerchannel))
{
DEBUG_LOG(m_logger) << "HandelEffects::init loggerchannel=" << loggerchannel;
DEBUG_LOG() << "HandelEffects::init loggerchannel=" << loggerchannel;
@@ -40,7 +40,7 @@ void HandelEffects::init(const QString &controlEffectsCfg, const QString &hostna
{
m_xmlReader.init(controlEffectsCfg);
DEBUG_LOG(m_logger) << "HandelEffects::init";
DEBUG_LOG() << "HandelEffects::init";
m_hostname = hostname;
m_lastDamage = -1;
m_effectType = et;
@@ -53,7 +53,7 @@ void HandelEffects::startEffects(int damagePercent)
{
if (m_lastDamage == damagePercent)
{
DEBUG_LOG(m_logger) << "damagePercent=" << damagePercent
DEBUG_LOG() << "damagePercent=" << damagePercent
<< " m_lastDamage=" << m_lastDamage
<< " return";
return;
@@ -73,7 +73,7 @@ void HandelEffects::startEffects(int damagePercent)
if (e->effectType == ET_Relay && m_effectType == ET_BsmFlash)
continue;
DEBUG_LOG(m_logger) << "- HandelEffects::Starting Effect " << e << " of Type " << e->effectType << ". ----"
DEBUG_LOG() << "- HandelEffects::Starting Effect " << e << " of Type " << e->effectType << ". ----"
<< " name=" << e->name;
for (const Range *range : e->constRanges())
{
@@ -87,7 +87,7 @@ void HandelEffects::startEffects(int damagePercent)
createEffectHandler(e, range);
}
DEBUG_LOG(m_logger) << "- End Effect ";
DEBUG_LOG() << "- End Effect ";
}
m_lastDamage = damagePercent;
}
@@ -103,7 +103,7 @@ void HandelEffects::createEffectHandler(Effect *e, const Range *range)
{
if (m_effectType == ET_BsmFlash)
{
INFO_LOG(m_logger) << "setOverrides connect Flashes" ;
INFO_LOG() << "setOverrides connect Flashes" ;
connect(handelEffect, &HandelEffect::triggerAllFlashlights, this, &HandelEffects::triggerAllFlashlights, Qt::UniqueConnection);
}
else
@@ -112,15 +112,15 @@ void HandelEffects::createEffectHandler(Effect *e, const Range *range)
connect(handelEffect, &HandelEffect::effectReady, this, &HandelEffects::onEffectReady);
DEBUG_LOG(m_logger) << "-- HandelEffects::Starting Range " << range->min << " - " << range->max
DEBUG_LOG() << "-- HandelEffects::Starting Range " << range->min << " - " << range->max
<< ". ----";
DEBUG_LOG(m_logger) << "-- Range has " << range->actions.count() << " actions";
DEBUG_LOG() << "-- Range has " << range->actions.count() << " actions";
handelEffect->init(range->actions, 1);
QTimer::singleShot(0, handelEffect, &HandelEffect::handleEffect);
DEBUG_LOG(m_logger) << "-- End Range ";
DEBUG_LOG() << "-- End Range ";
}
void HandelEffects::playHitSound(const int hitSoundId)
@@ -162,18 +162,18 @@ void HandelEffects::switchRelay(const SwitchRelayValues &switchRelayValues)
void HandelEffects::setOverrides(const QVector<BcuEffectState> &effectStates)
{
m_effectStates = effectStates;
DEBUG_LOG(m_logger) << "In set overrides for " << m_hostname << ", effectStates.size: " << effectStates.size();
DEBUG_LOG() << "In set overrides for " << m_hostname << ", effectStates.size: " << effectStates.size();
for(const auto &es : std::as_const(m_effectStates))
{
DEBUG_LOG(m_logger) << "m_effectStates: es.id=" << es.id
DEBUG_LOG() << "m_effectStates: es.id=" << es.id
<< ", es.type=" << es.type
<< ", es.override=" << es.effectOverride;
}
m_sounds = EffectOverride::EO_Auto;
DEBUG_LOG(m_logger) << "Nun die Schleife:";
DEBUG_LOG() << "Nun die Schleife:";
for(const auto &es : std::as_const(effectStates))
{
DEBUG_LOG(m_logger) << "es.id=" << es.id
DEBUG_LOG() << "es.id=" << es.id
<< ", es.type=" << es.type
<< ", es.override=" << es.effectOverride;
switch (es.type) {
@@ -194,14 +194,14 @@ void HandelEffects::setOverrides(const QVector<BcuEffectState> &effectStates)
if (e->effectHandler)
{
disconnect(e->effectHandler, &HandelEffect::newHttpRequest, this, &HandelEffects::sendHttpRequest);
INFO_LOG(m_logger) << "setOverrides emit triggerAllFlashlights(0,0,0,0)" ;
INFO_LOG() << "setOverrides emit triggerAllFlashlights(0,0,0,0)" ;
emit triggerAllFlashlights(0,0,0,0);
}
}
}
if (es.effectOverride == BEO_Off )
{
DEBUG_LOG(m_logger) << "BEO_Off";
DEBUG_LOG() << "BEO_Off";
QUrl url = XmlReader::createPreparedUrl(contents(), m_hostname);
QUrlQuery query;
@@ -260,7 +260,7 @@ void HandelEffects::setOverrides(const QVector<BcuEffectState> &effectStates)
{
if (e->effectHandler)
{
INFO_LOG(m_logger) << "setOverrides disconnect Flashes" ;
INFO_LOG() << "setOverrides disconnect Flashes" ;
disconnect (e->effectHandler, &HandelEffect::triggerAllFlashlights, this, &HandelEffects::triggerAllFlashlights);
}
}
@@ -309,7 +309,7 @@ QVector<BcuEffectState> HandelEffects::getOverrides()
break;
}
DEBUG_LOG(m_logger) << "getOverrides "
DEBUG_LOG() << "getOverrides "
<< " id=" << override.id
<< " type=" << override.type
<< " override" << override.effectOverride;
@@ -335,7 +335,7 @@ void HandelEffects::sendHttpRequest(const QUrl &url)
{
QUrl copy = url;
copy.setHost(m_hostname);
DEBUG_LOG(m_logger) << "sendHttpRequest" << copy.toString();
DEBUG_LOG() << "sendHttpRequest" << copy.toString();
emit newHttpRequest(copy, HandleHttpQueueMessageStatus::MS_Single);
}
@@ -349,7 +349,7 @@ void HandelEffects::onRelayStateTimerTimeout()
emit sendRelayState(m_relayState);
m_overridesSend = false;
}
DEBUG_LOG(m_logger) << "send get relay-State contents()=" << contents().toString()
DEBUG_LOG() << "send get relay-State contents()=" << contents().toString()
<< " m_offlineCounter=" << m_offlineCounter;
QUrl url = XmlReader::createPreparedUrl(contents(), m_hostname);
url.setPath(QStringLiteral("/relay.php"));
@@ -364,12 +364,12 @@ void HandelEffects::onRelayStateTimerTimeout()
void HandelEffects::handleEgcuReplyObject(const QString &host, const QByteArray &data)
{
bool relayStateChanged = false;
TRACE_LOG(m_logger) << "handleEgcuReply Object:" << data
TRACE_LOG() << "handleEgcuReply Object:" << data
<< " m_offlineState=" << m_offlineState;
if (m_offlineState)
{
DEBUG_LOG(m_logger) << "State wiederherstellen !!!!!!!!!!! m_offlineState=" << m_offlineState;
DEBUG_LOG() << "State wiederherstellen !!!!!!!!!!! m_offlineState=" << m_offlineState;
m_offlineState = false;
setOverrides(m_effectStates);
}
@@ -384,7 +384,7 @@ void HandelEffects::handleEgcuReplyObject(const QString &host, const QByteArray
rsi.id = it.key().toInt();
rsi.state = it.value().isString() ? (it.value().toString().compare(QLatin1String("on"), Qt::CaseInsensitive) == 0) : it.value().toBool(false);
m_relayState.relayStates.append(rsi);
TRACE_LOG(m_logger) << "id=" << rsi.id
TRACE_LOG() << "id=" << rsi.id
<< " state=" << rsi.state;
}
if ( m_relayState.relayStates.size() == lastRelayState.relayStates.size())
@@ -393,19 +393,19 @@ void HandelEffects::handleEgcuReplyObject(const QString &host, const QByteArray
{
if (m_relayState.relayStates[i].state != lastRelayState.relayStates[i].state)
{
TRACE_LOG(m_logger) << "Values relayStateChanged = true";
TRACE_LOG() << "Values relayStateChanged = true";
relayStateChanged = true;
}
}
}
else
{
TRACE_LOG(m_logger) << "Size relayStateChanged = true";
TRACE_LOG() << "Size relayStateChanged = true";
relayStateChanged = true;
}
if ( m_offlineCounter > 1)
{
TRACE_LOG(m_logger) << "m_offlineCounter=" << m_offlineCounter;
TRACE_LOG() << "m_offlineCounter=" << m_offlineCounter;
relayStateChanged = true;
}
@@ -413,7 +413,7 @@ void HandelEffects::handleEgcuReplyObject(const QString &host, const QByteArray
m_relayState.stateTime = QDateTime::currentMSecsSinceEpoch();
m_relayState.offlineTime = 0;
m_offlineCounter=0;
DEBUG_LOG(m_logger) << "host=" << host.toLower()
DEBUG_LOG() << "host=" << host.toLower()
<< " relayStateChanged=" << relayStateChanged
<< " m_overridesSend=" << m_overridesSend
<< " m_offlineState=" << m_offlineState;
@@ -427,7 +427,7 @@ void HandelEffects::handleEgcuReplyObject(const QString &host, const QByteArray
if ( m_relayState.hostname.toLower() == host.toLower() && relayStateChanged)
{
DEBUG_LOG(m_logger) << "emit sendRelayState(m_relayState) relayStateChanged";
DEBUG_LOG() << "emit sendRelayState(m_relayState) relayStateChanged";
emit sendRelayState(m_relayState);
}
}
@@ -435,7 +435,7 @@ void HandelEffects::handleEgcuReplyObject(const QString &host, const QByteArray
void HandelEffects::handleEgcuReplyArray(const QString &host, const QByteArray &data)
{
Q_UNUSED (host);
TRACE_LOG(m_logger) << "handleEgcuReply Array:" << data;
TRACE_LOG() << "handleEgcuReply Array:" << data;
m_relayState.relayStates.clear();
const QJsonObject jsonObject = QJsonDocument::fromJson(data).object();
@@ -449,7 +449,7 @@ void HandelEffects::handleEgcuReplyArray(const QString &host, const QByteArray &
rsi.id = i;
rsi.state = stateArray[i].isString() ? (stateArray[i].toString().compare(QLatin1String("on"), Qt::CaseInsensitive)== 0 ): stateArray[i].toBool(false);
m_relayState.relayStates.append(rsi);
TRACE_LOG(m_logger) << "id=" << rsi.id
TRACE_LOG() << "id=" << rsi.id
<< " state=" << rsi.state;
}
@@ -466,7 +466,7 @@ void HandelEffects::handleEgcuReplyArray(const QString &host, const QByteArray &
void HandelEffects::handleEgcuReply(const QString &host, const QByteArray &data)
{
DEBUG_LOG(m_logger) << "HandelEffects::handleEgcuReply host=" << host
DEBUG_LOG() << "HandelEffects::handleEgcuReply host=" << host
<< " m_hostname=" << m_hostname
<< " m_overridesSend=" << m_overridesSend;
@@ -477,18 +477,18 @@ void HandelEffects::handleEgcuReply(const QString &host, const QByteArray &data)
if (!jsonObject.contains(QStringLiteral("State")) )
{
m_overridesSend = true;
TRACE_LOG(m_logger) << "No State return";
TRACE_LOG() << "No State return";
return;
}
const QJsonValue jsonValue = jsonObject[QStringLiteral("State")];
if (jsonValue.isArray())
{
TRACE_LOG(m_logger) << "data isArray\n";
TRACE_LOG() << "data isArray\n";
handleEgcuReplyArray(host, data);
}
else
{
TRACE_LOG(m_logger) << "data isObject\n";
TRACE_LOG() << "data isObject\n";
handleEgcuReplyObject(host, data);
}
qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/ControlEffects/handeleffects.h
+1 -1
View File
@@ -5,7 +5,7 @@
#include "xmlreader.h"
#include <ControlEffects/controleffects_export.h>
#include "controleffects_export.h"
#include <BSM/bsm_types.h>
#include <logger.h>
#include "handle_http_request.h"
qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/ControlEffects/xmlreader.cpp
+25 -25
View File
@@ -21,11 +21,11 @@ bool XmlReader::init(const QString &effectConfigFile)
m_contents.effects.clear();
QFile file(effectConfigFile);
DEBUG_LOG(m_logger) << "open effectConfigFile: " << effectConfigFile;
DEBUG_LOG() << "open effectConfigFile: " << effectConfigFile;
if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
{
WARNING_LOG(m_logger) << "Couldn't open EffectConfigFile: " << effectConfigFile;
WARNING_LOG() << "Couldn't open EffectConfigFile: " << effectConfigFile;
return false;
}
@@ -63,18 +63,18 @@ bool XmlReader::init(const QString &effectConfigFile)
if (xml.hasError())
{
ERROR_LOG(m_logger) << "Effect Config File had XML Errors:\n" << xml.errorString();
ERROR_LOG() << "Effect Config File had XML Errors:\n" << xml.errorString();
return false;
}
DEBUG_LOG(m_logger) << "Effect Config File Contents: " << m_contents.toString();
DEBUG_LOG() << "Effect Config File Contents: " << m_contents.toString();
createHttpRequests();
return true;
}
Effect *XmlReader::parseEffect(QXmlStreamReader &xml)
{
DEBUG_LOG(m_logger) << "- parseEffect Start";
DEBUG_LOG() << "- parseEffect Start";
if (xml.tokenType() != QXmlStreamReader::StartElement ||
xml.name() != QStringLiteral("effect"))
@@ -125,12 +125,12 @@ Effect *XmlReader::parseEffect(QXmlStreamReader &xml)
}
xml.readNext();
}
DEBUG_LOG(m_logger) << "- parseEffect: Name: " << e->id
DEBUG_LOG() << "- parseEffect: Name: " << e->id
<< ", Type: " << e->effectType
<< ", Category: " << e->category
<< ", Name: " << e->name
<< ", override: " << e->override;
DEBUG_LOG(m_logger) << "- parseEffect End. It has " << e->ranges.size() << " ranges";
DEBUG_LOG() << "- parseEffect End. It has " << e->ranges.size() << " ranges";
return e;
}
@@ -140,7 +140,7 @@ Range *XmlReader::parseRange(QXmlStreamReader &xml)
xml.name() != QStringLiteral("range"))
return {};
DEBUG_LOG(m_logger) << "-- parseRange Start";
DEBUG_LOG() << "-- parseRange Start";
Range *r = new Range();
QXmlStreamAttributes attributes = xml.attributes();
@@ -164,10 +164,10 @@ Range *XmlReader::parseRange(QXmlStreamReader &xml)
xml.readNext();
}
DEBUG_LOG(m_logger) << "-- parseRange: [" << r->min << "-" << r->max << "]"
DEBUG_LOG() << "-- parseRange: [" << r->min << "-" << r->max << "]"
<< ", restartOnChange: " <<r->restartOnChange
<< ", ActionCount: " << r->actions.count();
DEBUG_LOG(m_logger) << "-- parseRange End";
DEBUG_LOG() << "-- parseRange End";
return r;
}
@@ -188,7 +188,7 @@ Action *XmlReader::parseAction(QXmlStreamReader &xml)
if (xml.name() == QStringLiteral("bsm"))
return parseBsmAction(xml);
WARNING_LOG(m_logger) << "--- parseUnknownAction with name '" << xml.name().string() << "'cannot be handled.";
WARNING_LOG() << "--- parseUnknownAction with name '" << xml.name().string() << "'cannot be handled.";
return {};
}
@@ -198,18 +198,18 @@ PauseAction *XmlReader::parsePauseAction(QXmlStreamReader &xml)
xml.name() != QLatin1String("pause"))
return {};
DEBUG_LOG(m_logger) << "--- parsePauseAction Start";
DEBUG_LOG() << "--- parsePauseAction Start";
QXmlStreamAttributes attributes = xml.attributes();
PauseAction *p = new PauseAction();
p->atype = static_cast<ActionType>(attributes.value(QStringLiteral("type")).toInt());
if (attributes.hasAttribute(QStringLiteral("comment")))
p->comment = attributes.value(QStringLiteral("comment")).toString();
p->pause = xml.readElementText().toInt();
DEBUG_LOG(m_logger) << "--- parsePauseAction: "
DEBUG_LOG() << "--- parsePauseAction: "
<< " Pause: " << p->pause
<< ", Comment: " << p->comment;
DEBUG_LOG(m_logger) << "--- parsePauseAction End";
DEBUG_LOG() << "--- parsePauseAction End";
return p;
}
@@ -218,7 +218,7 @@ RepeatAction *XmlReader::parseRepeatAction(QXmlStreamReader &xml)
if (xml.tokenType() != QXmlStreamReader::StartElement ||
xml.name() != QStringLiteral("repeat"))
return {};
DEBUG_LOG(m_logger) << "--- parseRepeatAction Start";
DEBUG_LOG() << "--- parseRepeatAction Start";
RepeatAction *ra = new RepeatAction();
QXmlStreamAttributes attributes = xml.attributes();
@@ -244,8 +244,8 @@ RepeatAction *XmlReader::parseRepeatAction(QXmlStreamReader &xml)
QString repetitions = QString::number(ra->count);
if (ra->count < 0)
repetitions = QLatin1String("Infinite");
DEBUG_LOG(m_logger) << "--- parseRepeatAction: Repetitions: " << repetitions << ", Comment: " << ra->comment;
DEBUG_LOG(m_logger) << "--- parseRepeatAction End";
DEBUG_LOG() << "--- parseRepeatAction: Repetitions: " << repetitions << ", Comment: " << ra->comment;
DEBUG_LOG() << "--- parseRepeatAction End";
return ra;
}
@@ -256,7 +256,7 @@ Action *XmlReader::parseStandardAction(QXmlStreamReader &xml)
xml.name() != QStringLiteral("action"))
return {};
DEBUG_LOG(m_logger) << "--- parseStandardAction Start";
DEBUG_LOG() << "--- parseStandardAction Start";
QXmlStreamAttributes attributes = xml.attributes();
@@ -269,9 +269,9 @@ Action *XmlReader::parseStandardAction(QXmlStreamReader &xml)
a->atype = static_cast<ActionType>(attributes.value(QStringLiteral("type")).toInt());
if (attributes.hasAttribute(QStringLiteral("comment")))
a->comment = attributes.value(QStringLiteral("comment")).toString();
DEBUG_LOG(m_logger) << "--- parseStandardAction: Type: " << a->atype
DEBUG_LOG() << "--- parseStandardAction: Type: " << a->atype
<< ", Comment: " << a->comment;
DEBUG_LOG(m_logger) << "--- parseStandardAction End";
DEBUG_LOG() << "--- parseStandardAction End";
return a;
}
@@ -280,7 +280,7 @@ BsmAction *XmlReader::parseBsmAction(QXmlStreamReader &xml)
QXmlStreamAttributes attributes = xml.attributes();
DEBUG_LOG(m_logger) << "--- parseBsmAction Start";
DEBUG_LOG() << "--- parseBsmAction Start";
BsmAction *a = new BsmAction();
a->atype = static_cast<ActionType>(attributes.value(QStringLiteral("type")).toInt());
if (attributes.hasAttribute(QStringLiteral("comment")))
@@ -302,14 +302,14 @@ BsmAction *XmlReader::parseBsmAction(QXmlStreamReader &xml)
xml.readNext();
}
DEBUG_LOG(m_logger) << "--- parseBsmAction: Type: " << a->atype
DEBUG_LOG() << "--- parseBsmAction: Type: " << a->atype
<< ", Pause: " << a->pause
<< ", Choplength: " << a->choplength
<< ", Count: " << a->count
<< ", Pulses: " << a->pulses
<< ", Pulseduration: " << a->pulseduration
<< ", Comment: " << a->comment;
DEBUG_LOG(m_logger) << "--- parseBsmAction End";
DEBUG_LOG() << "--- parseBsmAction End";
return a;
}
@@ -384,7 +384,7 @@ void XmlReader::generateUrl(const Effect *e, Action *a)
}
url.setQuery(query);
a->url = url;
DEBUG_LOG(m_logger) << "Effect " << e->name << ", Action '" << a->comment << "' now has URL: " << url.toString();
DEBUG_LOG() << "Effect " << e->name << ", Action '" << a->comment << "' now has URL: " << url.toString();
break;
}
case AC_Repeat:
@@ -397,7 +397,7 @@ void XmlReader::generateUrl(const Effect *e, Action *a)
case AC_Pause:
case AC_Bsm:
default:
DEBUG_LOG(m_logger) << "Effect " << e->name << ", Action '" << a->comment << "' of Type " << a->aclass << " needs no URL";
DEBUG_LOG() << "Effect " << e->name << ", Action '" << a->comment << "' of Type " << a->aclass << " needs no URL";
break;
}
}
qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/ControlEffects/xmlreader.h
-3
View File
@@ -193,9 +193,6 @@ private:
void generateUrl(const Effect *e, Action *a);
XmlContents m_contents;
NGL::INGLLogger &m_logger;
};
}