Adds immediate migration results
This commit is contained in:
2395 files changed
+357322
-2524
No files matched your search
+3
-3
@@ -14,10 +14,10 @@ SET(json_SRCS
|
||||
NGL_ADD_LIBRARY2(AAR SV BuildingControlJson SHARED ${json_SRCS})
|
||||
NGL_TARGET_LINK_LIBRARIES(BuildingControlJson
|
||||
PRIVATE
|
||||
Qt5::WebSockets
|
||||
Qt6::WebSockets
|
||||
PUBLIC
|
||||
Qt5::Core
|
||||
Qt5::Network
|
||||
Qt6::Core
|
||||
Qt6::Network
|
||||
BuildingControlCommon
|
||||
BuildingControlBsm
|
||||
BuildingControlVwm
|
||||
|
||||
+4
-3
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "json_api.h"
|
||||
#include <utility>
|
||||
#include "web_socket_handler.h"
|
||||
#include "web_socket_telegrams.h"
|
||||
#include <QWebSocket>
|
||||
@@ -168,7 +169,7 @@ void Api::onTelegramReceived(const std::shared_ptr<Telegrams::BaseTelegram> &tel
|
||||
Telegrams::SetEffectStates *sff = static_cast<Telegrams::SetEffectStates *>(tele.get());
|
||||
QVector<BcuEffectState> val;
|
||||
val.reserve(sff->effectStates.size());
|
||||
for(const auto &fi : qAsConst(sff->effectStates))
|
||||
for(const auto &fi : std::as_const(sff->effectStates))
|
||||
{
|
||||
BcuEffectState ff;
|
||||
ff.id = fi.id;
|
||||
@@ -192,7 +193,7 @@ void Api::onTelegramReceived(const std::shared_ptr<Telegrams::BaseTelegram> &tel
|
||||
Telegrams::SetFortifyFactor *sff = static_cast<Telegrams::SetFortifyFactor *>(tele.get());
|
||||
QVector<FortifyInfo> val;
|
||||
val.reserve(sff->fortifyFactors.size());
|
||||
for(const auto &fi : qAsConst(sff->fortifyFactors))
|
||||
for(const auto &fi : std::as_const(sff->fortifyFactors))
|
||||
{
|
||||
FortifyInfo ff;
|
||||
ff.roomId = fi.roomId;
|
||||
@@ -207,7 +208,7 @@ void Api::onTelegramReceived(const std::shared_ptr<Telegrams::BaseTelegram> &tel
|
||||
Telegrams::RelayState *sff = static_cast<Telegrams::RelayState *>(tele.get());
|
||||
QVector<RelayStateInfo> val;
|
||||
val.reserve(sff->relayStates.size());
|
||||
for(const auto &fi : qAsConst(sff->relayStates))
|
||||
for(const auto &fi : std::as_const(sff->relayStates))
|
||||
{
|
||||
RelayStateInfo ff;
|
||||
ff.id = fi.id;
|
||||
|
||||
+3
-2
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "web_socket_handler.h"
|
||||
#include <utility>
|
||||
#include "web_socket_telegrams.h"
|
||||
#include <QWebSocket>
|
||||
#include <iostream>
|
||||
@@ -18,7 +19,7 @@ WebSocketHandler::WebSocketHandler(QObject *parent)
|
||||
|
||||
WebSocketHandler::~WebSocketHandler()
|
||||
{
|
||||
for (QWebSocket *s : qAsConst(m_webSockets))
|
||||
for (QWebSocket *s : std::as_const(m_webSockets))
|
||||
{
|
||||
s->disconnect(this);
|
||||
s->close();
|
||||
@@ -51,7 +52,7 @@ bool WebSocketHandler::sendTelegram(const Telegrams::BaseTelegram *tele, QWebSoc
|
||||
DEBUG_LOG(m_logger) << "jsonStr" << jsonStr;
|
||||
|
||||
bool bOk = false;
|
||||
for (QWebSocket *ws : qAsConst(m_webSockets))
|
||||
for (QWebSocket *ws : std::as_const(m_webSockets))
|
||||
{
|
||||
if (wsDirect != nullptr && wsDirect != ws)
|
||||
continue;
|
||||
|
||||
Reference in new issue
Block a user