fix Warning

qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_api.cpp

@@ -11,8 +11,8 @@ namespace BSM
 {
 Api::Api(QObject *parent)
   : QObject(parent)
-  , m_socketHandler(new SocketHandler(this))
   , m_logger(TrainingAreaBase::getLogger("BSM.Api"))
+  , m_socketHandler(new SocketHandler(this))
 {
   connect(m_socketHandler, &SocketHandler::opticalShot,
           this, &Api::opticalShot);

qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_socket.cpp

@@ -15,11 +15,11 @@ namespace BSM
 {
 Socket::Socket(const Bsm &cfg, QObject *parent)
   : QObject(parent)
+  , m_logger(TrainingAreaBase::getLogger("BSM.Socket"))
   , m_config(cfg)
   , m_tcpSocket(new QTcpSocket(this))
   , m_reconnectTimer(nullptr)
   , m_aliveTimer(new QTimer(this))
-  , m_logger(TrainingAreaBase::getLogger("BSM.Socket"))
 {
   m_aliveTimer->setTimerType(Qt::VeryCoarseTimer);
   m_aliveTimer->setSingleShot(true);

qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/Json/web_socket_handler.cpp

@@ -12,8 +12,8 @@ namespace BuildingControlUnit
 namespace Json
 {
 WebSocketHandler::WebSocketHandler(QObject *parent) : QObject(parent)
-  , m_webSocketServer(new QWebSocketServer(QStringLiteral("BCU"), QWebSocketServer::NonSecureMode, this)),
-    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
+  , m_webSocketServer(new QWebSocketServer(QStringLiteral("BCU"), QWebSocketServer::NonSecureMode, this)) {}
 
 WebSocketHandler::~WebSocketHandler()
 {

qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_api.cpp

@@ -41,8 +41,8 @@ static const bool point3dRegistered = []() {
 
 Api::Api(QObject *parent)
   : QObject(parent)
-  , m_lastHitResult(HitResult())
   , m_logger(TrainingAreaBase::getLogger("VWM.Api"))
+  , m_lastHitResult(HitResult())
 {
     Q_UNUSED(point3dRegistered);
 }

qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_xml_reader.cpp

@@ -294,12 +294,10 @@ bool readBuilding(const QString &fn, Building &cfg)
 bool readBuilding(const QByteArray &data, Building &cfg)
 {
   QDomDocument doc;
-  QString errorMsg;
-  int errorLine;
-  int errorColumn;
-  if (!doc.setContent(data, &errorMsg, &errorLine, &errorColumn))
+  const auto parseResult = doc.setContent(data);
+  if (!parseResult)
   {
-    ERROR_LOG(logger()) << "Line=" << errorLine << ", Column=" << errorColumn << ": " << errorMsg;
+    ERROR_LOG(logger()) << "Line=" << int(parseResult.errorLine) << ", Column=" << int(parseResult.errorColumn) << ": " << parseResult.errorMessage;
     return false;
   } 
   const QDomElement domRoot = doc.documentElement();

qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/bcu_xml_reader.cpp

@@ -32,13 +32,11 @@ QDomElement readFile(const QString &fn, const QString &rootTag)
     return QDomElement();
   }
 
-  QString errMsg;
-  int errLine = 0;
-  int errColumn = 0;
   QDomDocument doc;
-  if (!doc.setContent(data, &errMsg, &errLine, &errColumn))
+  const auto parseResult = doc.setContent(data);
+  if (!parseResult)
   {
-    WARNING_LOG(logger()) << "Could not parse xml file '" << fn << "' at " << errLine << ":" << errColumn << ": " << errMsg;
+    WARNING_LOG(logger()) << "Could not parse xml file '" << fn << "' at " << int(parseResult.errorLine) << ":" << int(parseResult.errorColumn) << ": " << parseResult.errorMessage;
     return QDomElement();
   }
 

qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_control_handler.cpp

@@ -25,8 +25,8 @@ BuildingControlHandler::BuildingControlHandler(MainHandler *mainHandler)
   , Interface::Fts::SendCesHit3DonBuildingRequestHandler(mainHandler->ddsHandler()->fts())
   , Interface::Fts::TriggerBsmFlashRequestHandler(mainHandler->ddsHandler()->fts())
   , Interface::Fts::SwitchRelayRequestHandler(mainHandler->ddsHandler()->fts())
-  , m_mainHandler(mainHandler)
   , m_logger(getLogger("BuildingControlHandler"))
+  , m_mainHandler(mainHandler)
 {}
 
 BuildingControlHandler::~BuildingControlHandler()

qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_process.cpp

@@ -46,6 +46,7 @@ BuildingProcess::BuildingProcess(MainHandler *mainHandler,
                                  const bool initBuilding,
                                  QObject *parent)
   : QObject(parent)
+  , m_logger(getLogger("BuildingProcess"))
   , m_mainHandler(mainHandler)
   , m_buildingInfo(info)
   , m_wsSocket(nullptr)
@@ -53,7 +54,6 @@ BuildingProcess::BuildingProcess(MainHandler *mainHandler,
   , m_hitLineInfoTimer(new QTimer(this))
   , m_hitLineId(info.mseId << 16)
   , m_initBuilding(initBuilding)
-  , m_logger(getLogger("BuildingProcess"))
 {
   m_proc.setProgram(procName);
   m_proc.setReadChannel(QProcess::StandardOutput);
@@ -1145,7 +1145,7 @@ void BuildingProcess::openWebSocket()
 {
   closeWebSocket();
   m_wsSocket = new QWebSocket;
-  connect(m_wsSocket, QOverload<QAbstractSocket::SocketError>::of(&QWebSocket::error),
+  connect(m_wsSocket, &QWebSocket::errorOccurred,
           this, &BuildingProcess::onWebSocketError);
   connect(m_wsSocket, &QWebSocket::connected,
           this, &BuildingProcess::onWebSocketConnected);

qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/dds_handler.cpp

@@ -14,8 +14,8 @@ namespace Buildings
 {
 
 DdsHandler::DdsHandler(int domainId, int exerciseId)
-  : m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Exercise, exerciseId))
-  , m_logger(getLogger("DdsHandler"))
+  : m_logger(getLogger("DdsHandler"))
+  , m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Exercise, exerciseId))
 {
   DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }

qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ism_handler.cpp

@@ -17,12 +17,12 @@
 namespace Buildings
 {
 
-IsmHandler::IsmHandler(MainHandler *mainHandler) : m_mainHandler(mainHandler)
+IsmHandler::IsmHandler(MainHandler *mainHandler) : m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
+  , m_mainHandler(mainHandler)
   , m_dtcIsm(nullptr)
   , m_ftcIsm(nullptr)
   , m_changeTimeoutTimer(new QTimer(this))
-  , m_changeTimeoutTimerInit(new QTimer(this)),
-    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
+  , m_changeTimeoutTimerInit(new QTimer(this)) {
   connect(m_changeTimeoutTimer, &QTimer::timeout,
           this, &IsmHandler::onBuildingsChanged);
   m_changeTimeoutTimer->setInterval(3 * 1000);

qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/pdm_handler.cpp

@@ -8,9 +8,9 @@
 
 namespace Buildings
 {
-PdmHandler::PdmHandler(MainHandler *mainHandler) : m_mainHandler(mainHandler)
-  , m_bPdmInitialized(false),
-    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
+PdmHandler::PdmHandler(MainHandler *mainHandler) : m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
+  , m_mainHandler(mainHandler)
+  , m_bPdmInitialized(false) {}
 
 PdmHandler::~PdmHandler()
 {}

qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ppm_handler.cpp

@@ -7,8 +7,8 @@
 
 namespace Buildings
 {
-PpmHandler::PpmHandler(MainHandler *mainHandler) : m_mainHandler(mainHandler),
-    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
+PpmHandler::PpmHandler(MainHandler *mainHandler) : m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
+  , m_mainHandler(mainHandler) {}
 
 PpmHandler::~PpmHandler()
 {}

qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/relay_info_handler.cpp

@@ -9,8 +9,8 @@ namespace Buildings
 RelayInfoHandler::RelayInfoHandler(MainHandler *mainHandler)
   : QObject()
   , Interface::Fts::SetRelayInfoRequestHandler(mainHandler->ddsHandler()->fts())
-  , m_mainHandler(mainHandler)
   , m_logger(getLogger("RelayInfoHandler"))
+  , m_mainHandler(mainHandler)
 {}
 
 RelayInfoHandler::~RelayInfoHandler()

qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/web_socket_handler.cpp

@@ -17,9 +17,9 @@ namespace Buildings
 
 WebSocketHandler::WebSocketHandler(const std::shared_ptr<BuildingControlHandler> &buildingControlHandler, QObject *parent)
   : QObject(parent)
+  , m_logger(getLogger(QStringLiteral("WebSocketHandler")))
   , m_buildingControlHandler(buildingControlHandler)
   , m_webSocketServer(new QWebSocketServer(QStringLiteral("BuildingsSocket"), QWebSocketServer::NonSecureMode, this))
-  , m_logger(getLogger(QStringLiteral("WebSocketHandler")))
 {}
 
 WebSocketHandler::~WebSocketHandler()