Adds immediate migration results in progress

qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_aes_data.cpp

@@ -38,7 +38,7 @@ bool HandlerOcAesData::init()
   // AES DTC enable
   if (!m_aesDtc->enableDangerArea())
   {
-    ERROR_LOG() << "Enabling AES Data-Topics failed.";
+    ERROR_LOG(m_logger) << "Enabling AES Data-Topics failed.";
     return false;
   }
 
@@ -46,27 +46,27 @@ bool HandlerOcAesData::init()
   if (!m_aesFtc->enableDangerAreaModify() ||
       !m_aesFtc->enableDangerAreaRemove())
   {
-    ERROR_LOG() << "Enabling AES Function-Topics failed.";
+    ERROR_LOG(m_logger) << "Enabling AES Function-Topics failed.";
     return false;
   }
 
   // GIM DTC enable
   if (!m_gimDtc->enableIed())
   {
-    ERROR_LOG() << "Enabling GIM Data-Topics failed.";
+    ERROR_LOG(m_logger) << "Enabling GIM Data-Topics failed.";
     return false;
   }
   // TAB DTS enable
   if (!m_tabDts->enableDefinitionIed())
   {
-    ERROR_LOG() << "Enabling TAB DTS Data-Topics failed.";
+    ERROR_LOG(m_logger) << "Enabling TAB DTS Data-Topics failed.";
     return false;
   }
 
   // TABOC DTC enable
   if (!m_tabocDtc->enableSpecificsExercise())
   {
-    ERROR_LOG() << "Enabling TABOC Data-Topics failed.";
+    ERROR_LOG(m_logger) << "Enabling TABOC Data-Topics failed.";
     return false;
   }
   connect(m_tabocDtc.get(), &TrainingAreaBaseOC::Interface::Dtc::specificsExerciseChanged, this, &HandlerOcAesData::onSpecificsExerciseChanged);
@@ -81,11 +81,11 @@ bool HandlerOcAesData::init()
 
 void HandlerOcAesData::process(const QByteArray &data)
 {
-  DEBUG_LOG() << "Compressed binary data: " << data.toHex(' ');
+  DEBUG_LOG(m_logger) << "Compressed binary data: " << data.toHex(' ');
 
   QByteArray uncompressed = MainHandler::tryUncompress(data, true);
 
-  DEBUG_LOG() << "Uncompressed binary data: " << uncompressed.toHex(' ');
+  DEBUG_LOG(m_logger) << "Uncompressed binary data: " << uncompressed.toHex(' ');
   OcSituation::AesType aesType;
   LtsUtils::get1Byte(uncompressed, aesType);
 
@@ -109,7 +109,7 @@ void HandlerOcAesData::process(const QByteArray &data)
   }
   default:
   {
-    WARNING_LOG() << "Aes type: " << aesType << " is currently not handled.";
+    WARNING_LOG(m_logger) << "Aes type: " << aesType << " is currently not handled.";
   }
   }
 }
@@ -117,23 +117,23 @@ void HandlerOcAesData::process(const QByteArray &data)
 void HandlerOcAesData::onDangerAreaModifyReply(const Core::FunctionReplyObject &reply)
 {
   if (reply.error())
-    ERROR_LOG() << "Danger area modify failed: " << reply.translated();
+    ERROR_LOG(m_logger) << "Danger area modify failed: " << reply.translated();
   else
-    DEBUG_LOG() << "Danger area modify successfull. Id: " << reply.id();
+    DEBUG_LOG(m_logger) << "Danger area modify successfull. Id: " << reply.id();
 }
 
 void HandlerOcAesData::onDangerAreaRemoveReply(const Core::FunctionReplyObject &reply)
 {
   if (reply.error())
-    ERROR_LOG() << "Danger area remove failed: " << reply.translated();
+    ERROR_LOG(m_logger) << "Danger area remove failed: " << reply.translated();
   else
-    DEBUG_LOG() << "Danger area remove successfull. Id: " << reply.id();
+    DEBUG_LOG(m_logger) << "Danger area remove successfull. Id: " << reply.id();
 }
 
 void HandlerOcAesData::handleDangerAreas(const QByteArray &data, size_t pos)
 {
-  INFO_LOG() << "Got new danger area data";
-  DEBUG_LOG() << "Binary data: " << data.toHex(' ');
+  INFO_LOG(m_logger) << "Got new danger area data";
+  DEBUG_LOG(m_logger) << "Binary data: " << data.toHex(' ');
 
   QList<int> aesToBeDeleted = m_aesDtc->dangerAreas().keys();
 
@@ -170,7 +170,7 @@ void HandlerOcAesData::handleDangerAreas(const QByteArray &data, size_t pos)
     }
     req.segments(segments);
 
-    DEBUG_LOG() << (aesToBeDeleted.contains(req.id()) ? "Modifying " : "Creating ") << "danger area: " << req;
+    DEBUG_LOG(m_logger) << (aesToBeDeleted.contains(req.id()) ? "Modifying " : "Creating ") << "danger area: " << req;
 
     aesToBeDeleted.removeAll(req.id()); // item was created/modified -> does not need to be deleted
     req.id(req.id() * -1); // inverted id to mark as for oc
@@ -183,7 +183,7 @@ void HandlerOcAesData::handleDangerAreas(const QByteArray &data, size_t pos)
       continue;
     if (m_aesDtc->dangerArea(id).effectStateId().underlying() > AreaEffectSimulation::AesEffectState::EsRemoved)
     {
-      DEBUG_LOG() << "Removing danger area id: " << id;
+      DEBUG_LOG(m_logger) << "Removing danger area id: " << id;
       m_aesFtc->dangerAreaRemoveRequest(Core::RemoveElementRequest(id), this);
     }
   }
@@ -191,8 +191,8 @@ void HandlerOcAesData::handleDangerAreas(const QByteArray &data, size_t pos)
 
 void HandlerOcAesData::handleIeds(const QByteArray &data, size_t pos)
 {
-  INFO_LOG() << "Got new ied data";
-  DEBUG_LOG() << "Binary data: " << data.toHex(' ');
+  INFO_LOG(m_logger) << "Got new ied data";
+  DEBUG_LOG(m_logger) << "Binary data: " << data.toHex(' ');
 
   int cnt;
   LtsUtils::get1Byte(data, pos, cnt);
@@ -224,7 +224,7 @@ void HandlerOcAesData::handleIeds(const QByteArray &data, size_t pos)
     LtsUtils::get3Byte(data, pos, y);
     def.position(relativeFromGeoPosition(x, y));
 
-    DEBUG_LOG() << "Publishing definition ied: " << def;
+    DEBUG_LOG(m_logger) << "Publishing definition ied: " << def;
 
     m_tabDts->publish(def);
   }
@@ -232,8 +232,8 @@ void HandlerOcAesData::handleIeds(const QByteArray &data, size_t pos)
 
 void HandlerOcAesData::handleIedPositions(const QByteArray &data, size_t pos)
 {
-  INFO_LOG() << "Got new ied positions data";
-  DEBUG_LOG() << "Binary data: " << data.toHex(' ');
+  INFO_LOG(m_logger) << "Got new ied positions data";
+  DEBUG_LOG(m_logger) << "Binary data: " << data.toHex(' ');
 
   int cnt;
   LtsUtils::get1Byte(data, pos, cnt);