diff --git a/TetraIF/CoPrtCnv/CoPrtCnvTelegramConverterNewIcd.cpp b/TetraIF/CoPrtCnv/CoPrtCnvTelegramConverterNewIcd.cpp
index 09fed4816..59dc804e5 100644
--- a/TetraIF/CoPrtCnv/CoPrtCnvTelegramConverterNewIcd.cpp
+++ b/TetraIF/CoPrtCnv/CoPrtCnvTelegramConverterNewIcd.cpp
@@ -483,7 +483,7 @@ static CoPrtCnvRadioTelegram *convertToRadioInternal(T *a_telegram)
     radioTelegram->setPayloadData((uint8_t) 0); 
 
     radioTelegram->setPayloadData(tele.mhPoints.size(), 1); 
-    for(auto pos : qAsConst(tele.mhPoints))
+    for(auto pos : std::as_const(tele.mhPoints))
     {
       radioTelegram->setPayloadData(pos.offsetY, 3);
       radioTelegram->setPayloadData(pos.offsetX, 3);
diff --git a/TetraIF/LogView/LogViewField.cpp b/TetraIF/LogView/LogViewField.cpp
index 4646f018f..711d4a867 100644
--- a/TetraIF/LogView/LogViewField.cpp
+++ b/TetraIF/LogView/LogViewField.cpp
@@ -38,7 +38,7 @@ LogViewField::LogViewField(const QString& a_name, const E_FieldKind a_kind, cons
 
 LogViewField::~LogViewField()
 {
-  for (LogViewField *f : qAsConst(m_Child))
+  for (LogViewField *f : std::as_const(m_Child))
     delete f;
   if (m_bDeleteXdr)
     delete m_XdrElement;
diff --git a/TetraIF/LogView/LogViewTelegramDialog.cpp b/TetraIF/LogView/LogViewTelegramDialog.cpp
index 310add7c5..3ad7c7f02 100644
--- a/TetraIF/LogView/LogViewTelegramDialog.cpp
+++ b/TetraIF/LogView/LogViewTelegramDialog.cpp
@@ -232,7 +232,7 @@ void LogViewTelegramDialog::fillTelegram(LogViewTelegram *a_telegram)
 
   
   
-  for (const auto ptr : qAsConst(m_EditInfoList))
+  for (const auto ptr : std::as_const(m_EditInfoList))
   {
     if (!ptr->isValid())
     {
@@ -245,7 +245,7 @@ void LogViewTelegramDialog::fillTelegram(LogViewTelegram *a_telegram)
   
   a_telegram->resetOffset();
   a_telegram->clearJsonData();
-  for (auto ptr : qAsConst(m_EditInfoList))
+  for (auto ptr : std::as_const(m_EditInfoList))
   {
     if (!ptr->saveContent(a_telegram))
     {
diff --git a/TetraIF/LogView/LogViewTetraTelegramsParser.cpp b/TetraIF/LogView/LogViewTetraTelegramsParser.cpp
index 5825c72fc..15519ef03 100644
--- a/TetraIF/LogView/LogViewTetraTelegramsParser.cpp
+++ b/TetraIF/LogView/LogViewTetraTelegramsParser.cpp
@@ -231,7 +231,7 @@ int LogViewTetraTelegramsParser::parseStruct(const QVector<QStringRef> &lines, i
     if (mi.isEnum && !mi.type.contains(QLatin1String("::")))
     {
       
-      for (const auto &ei : qAsConst(m_enums))
+      for (const auto &ei : std::as_const(m_enums))
       {
         if (ei.type == mi.type)
         {
@@ -334,7 +334,7 @@ int LogViewTetraTelegramsParser::parseEnum(const QVector<QStringRef> &lines, int
   }
 
   DEBUG_LOG(m_logger) << "Found Enum: " << ei.type;
-  for (const EnumValue &ev : qAsConst(ei.values))
+  for (const EnumValue &ev : std::as_const(ei.values))
     DEBUG_LOG(m_logger) << "Member[" << i << "]: " << ev.key << " = " << ev.value;
 
   if (ei.type == QLatin1String("TelegramId"))
@@ -391,7 +391,7 @@ int LogViewTetraTelegramsParser::parseConstraint(const QVector<QStringRef> &line
     if (enumKey.endsWith(QLatin1Char(';')))
       enumKey.chop(1);
     bool bFound = false;
-    for (const auto &v : qAsConst(m_telegramIdEnum.values))
+    for (const auto &v : std::as_const(m_telegramIdEnum.values))
     {
       if (v.key == enumKey)
       {
diff --git a/TetraIF/LogView/LogViewXdrParser.cpp b/TetraIF/LogView/LogViewXdrParser.cpp
index 06b530817..c5b5db710 100644
--- a/TetraIF/LogView/LogViewXdrParser.cpp
+++ b/TetraIF/LogView/LogViewXdrParser.cpp
@@ -551,7 +551,7 @@ void LogViewXdrParser::parseUnion(const QString& a_line)
         
         if (!isNextWord(";")) return;
         
-        for (const QString &constExpr : qAsConst(constExprList))
+        for (const QString &constExpr : std::as_const(constExprList))
         {
           bool error;
           int32_t telegramId = static_cast<int>(telegramIdType->getChildValue(constExpr, &error));
diff --git a/TetraIF/PrtCnv/LastTest/tetra_if.cpp b/TetraIF/PrtCnv/LastTest/tetra_if.cpp
index 78aa2d235..d37726707 100644
--- a/TetraIF/PrtCnv/LastTest/tetra_if.cpp
+++ b/TetraIF/PrtCnv/LastTest/tetra_if.cpp
@@ -357,7 +357,7 @@ void TetraIF::onSendData()
   static char s_randomChar = 0;
   for (int i = 0; i < telegramsToSendNow; ++i)
   {
-    for (unsigned short dest_issi : qAsConst(m_issiList))
+    for (unsigned short dest_issi : std::as_const(m_issiList))
     {
       
       m_data[0] = s_randomChar++;
@@ -406,7 +406,7 @@ void TetraIF::parseISSIs(const QStringList &issiList)
 QString TetraIF::getIssisAsString() const
 {
   QString ret;
-  for (unsigned short issi : qAsConst(m_issiList))
+  for (unsigned short issi : std::as_const(m_issiList))
     ret += QString::number(issi) + QLatin1String(", ");
   return ret.left(ret.size() - 2);
 }
diff --git a/TetraIF/PrtCnv/LastTestAuswertung/mainwindow.cpp b/TetraIF/PrtCnv/LastTestAuswertung/mainwindow.cpp
index 0cad665e9..5dbdb16fd 100644
--- a/TetraIF/PrtCnv/LastTestAuswertung/mainwindow.cpp
+++ b/TetraIF/PrtCnv/LastTestAuswertung/mainwindow.cpp
@@ -326,7 +326,7 @@ int MainWindow::auswerten()
   int fehlcount = 0;
   QVector<uint> numList;
   int i = 0;
-  for (const QString &issi : qAsConst(issis))
+  for (const QString &issi : std::as_const(issis))
   {
     
     numList.clear();
diff --git a/TetraIF/PrtCnv/PrtCnvBroadcastMgr.cpp b/TetraIF/PrtCnv/PrtCnvBroadcastMgr.cpp
index b36512d8f..090a3dd66 100644
--- a/TetraIF/PrtCnv/PrtCnvBroadcastMgr.cpp
+++ b/TetraIF/PrtCnv/PrtCnvBroadcastMgr.cpp
@@ -542,7 +542,7 @@ std::shared_ptr<N_CoPrtCnv::CoPrtCnvRadioTelegram> PrtCnvBroadcastMgr::createAcc
   auto tele(std::make_shared<N_CoPrtCnv::CoPrtCnvRadioTelegram>(GEF_REAKTIVIERUNG_DUS_MINE, 5 + 2 + sizeof(uint16_t) * idsToSendNow, 0));
   tele->setPayload2Byte(curBcIndex);
   tele->setPayload2Byte(idsToSendNow);
-  for (int dusMineId : qAsConst(m_activatedDusMines))
+  for (int dusMineId : std::as_const(m_activatedDusMines))
     tele->setPayload2Byte(dusMineId);
 
   return tele;
@@ -1131,7 +1131,7 @@ void PrtCnvBroadcastMgr::reactivateDusMine(const std::shared_ptr<N_CoPrtCnv::CoP
   if (0 == nbrOfMines)
   {
     
-    for (int dusMineId : qAsConst(m_deactivatedBcIndex2DusMine))
+    for (int dusMineId : std::as_const(m_deactivatedBcIndex2DusMine))
     {
       removeDusMineDeactivationFromBroadcastMap(dusMineId);
       addToActivatedDusMine(dusMineId);
diff --git a/TetraIF/PrtCnv/PrtCnvSocketThread.cpp b/TetraIF/PrtCnv/PrtCnvSocketThread.cpp
index 0b8584273..e9ac70b87 100644
--- a/TetraIF/PrtCnv/PrtCnvSocketThread.cpp
+++ b/TetraIF/PrtCnv/PrtCnvSocketThread.cpp
@@ -371,7 +371,7 @@ void PrtCnvSocketThread::readHostAdresses()
       continue;
     m_hostAdresses.push_back(qMakePair(host, port));
   }
-  for (const auto &p : qAsConst(m_hostAdresses)) {
+  for (const auto &p : std::as_const(m_hostAdresses)) {
     INFO_LOG(m_logger) << "Read Host Adress " << p.first
                        << ":" << p.second
                        << " from settings";
diff --git a/TetraIF/PrtCnv/TetraTestServer/worker.cpp b/TetraIF/PrtCnv/TetraTestServer/worker.cpp
index d975df8d4..d86afb8c1 100644
--- a/TetraIF/PrtCnv/TetraTestServer/worker.cpp
+++ b/TetraIF/PrtCnv/TetraTestServer/worker.cpp
@@ -327,7 +327,7 @@ void TTWorker::sendTaktischerStatus(uint32_t eqId, uint32_t issi, TrainingAreaBa
   tele.tasVulnerabilityKindId = 459008;
   tele.vulnerabilityBits = 0;
 
-  for (Player *p : qAsConst(m_playerList))
+  for (Player *p : std::as_const(m_playerList))
   {
     if (p->eqId == eqId)
     {