diff --git a/src/Gui/DlgGeneralImp.cpp b/src/Gui/DlgGeneralImp.cpp
index 772ec6fb04e4..90f3d7ac0e6d 100644
--- a/src/Gui/DlgGeneralImp.cpp
+++ b/src/Gui/DlgGeneralImp.cpp
@@ -360,7 +360,7 @@ void DlgGeneralImp::loadSettings()
     for (const auto & qssPath : qssPaths) {
         dir.setPath(qssPath);
         QFileInfoList fileNames = dir.entryInfoList(filter, QDir::Files, QDir::Name);
-        for (const auto & fileName : qAsConst(fileNames)) {
+        for (const auto & fileName : std::as_const(fileNames)) {
             if (cssFiles.find(fileName.baseName()) == cssFiles.end()) {
                 cssFiles[fileName.baseName()] = fileName.fileName();
             }
diff --git a/src/Gui/DlgParameterImp.cpp b/src/Gui/DlgParameterImp.cpp
index 8df3dda0e102..6023fb8d627c 100644
--- a/src/Gui/DlgParameterImp.cpp
+++ b/src/Gui/DlgParameterImp.cpp
@@ -160,7 +160,7 @@ void DlgParameterImp::onFindGroupTtextChanged(const QString &SearchStr)
 
     // at first reset all items to the default font and expand state
     if (!foundList.empty()) {
-        for (QTreeWidgetItem* item : qAsConst(foundList)) {
+        for (QTreeWidgetItem* item : std::as_const(foundList)) {
             item->setFont(0, defaultFont);
             item->setForeground(0, defaultColor);
             ExpandItem = item;
@@ -191,7 +191,7 @@ void DlgParameterImp::onFindGroupTtextChanged(const QString &SearchStr)
         // reset background style sheet
         if (!ui->findGroupLE->styleSheet().isEmpty())
             ui->findGroupLE->setStyleSheet(QString());
-        for (QTreeWidgetItem* item : qAsConst(foundList)) {
+        for (QTreeWidgetItem* item : std::as_const(foundList)) {
             item->setFont(0, boldFont);
             item->setForeground(0, Qt::red);
             // expand its parent to see the item
diff --git a/src/Gui/DlgPropertyLink.cpp b/src/Gui/DlgPropertyLink.cpp
index e1a5dbf429f6..96db06a07a1c 100644
--- a/src/Gui/DlgPropertyLink.cpp
+++ b/src/Gui/DlgPropertyLink.cpp
@@ -362,7 +362,7 @@ void DlgPropertyLink::init(const App::DocumentObjectT &prop, bool tryFilter) {
     // For link list type property, try to auto filter type
     if(tryFilter && isLinkList) {
         Base::Type objType;
-        for(const auto& link : qAsConst(oldLinks)) {
+        for(const auto& link : std::as_const(oldLinks)) {
             auto obj = link.getSubObject();
             if(!obj)
                 continue;
diff --git a/src/Gui/DocumentRecovery.cpp b/src/Gui/DocumentRecovery.cpp
index fd64b87cbef7..6ac101e42f43 100644
--- a/src/Gui/DocumentRecovery.cpp
+++ b/src/Gui/DocumentRecovery.cpp
@@ -727,7 +727,7 @@ void DocumentRecoveryCleaner::subtractFiles(QStringList& files)
 void DocumentRecoveryCleaner::subtractDirs(QFileInfoList& dirs)
 {
     if (!ignoreDirs.isEmpty() && !dirs.isEmpty()) {
-        for (const auto& it : qAsConst(ignoreDirs)) {
+        for (const auto& it : std::as_const(ignoreDirs)) {
             dirs.removeOne(it);
         }
     }
diff --git a/src/Gui/GraphvizView.cpp b/src/Gui/GraphvizView.cpp
index 4d44b5a07697..84f4f6af4928 100644
--- a/src/Gui/GraphvizView.cpp
+++ b/src/Gui/GraphvizView.cpp
@@ -453,7 +453,7 @@ bool GraphvizView::onMsg(const char* pMsg, const char**)
         formatMap << qMakePair(QString::fromLatin1("%1 (*.pdf)").arg(tr("PDF format")), QString::fromLatin1("pdf"));
 
         QStringList filter;
-        for (const auto & it : qAsConst(formatMap)) {
+        for (const auto& it : std::as_const(formatMap)) {
             filter << it.first;
         }
 
@@ -461,7 +461,7 @@ bool GraphvizView::onMsg(const char* pMsg, const char**)
         QString fn = Gui::FileDialog::getSaveFileName(this, tr("Export graph"), QString(), filter.join(QLatin1String(";;")), &selectedFilter);
         if (!fn.isEmpty()) {
             QString format;
-            for (const auto & it : qAsConst(formatMap)) {
+            for (const auto & it : std::as_const(formatMap)) {
                 if (selectedFilter == it.first) {
                     format = it.second;
                     break;
diff --git a/src/Gui/Language/Translator.cpp b/src/Gui/Language/Translator.cpp
index f8350fc05213..0e5cfa09ff97 100644
--- a/src/Gui/Language/Translator.cpp
+++ b/src/Gui/Language/Translator.cpp
@@ -220,7 +220,7 @@ TStringMap Translator::supportedLocales() const
 
     // List all .qm files
     for (const auto& domainMap : d->mapLanguageTopLevelDomain) {
-        for (const auto& directoryName : qAsConst(d->paths)) {
+        for (const auto& directoryName : std::as_const(d->paths)) {
             QDir dir(directoryName);
             QString filter = QString::fromLatin1("*_%1.qm").arg(QString::fromStdString(domainMap.second));
             QStringList fileNames = dir.entryList(QStringList(filter), QDir::Files, QDir::Name);
diff --git a/src/Gui/Macro.cpp b/src/Gui/Macro.cpp
index 46f37674e8a8..b0afffdc6d78 100644
--- a/src/Gui/Macro.cpp
+++ b/src/Gui/Macro.cpp
@@ -88,7 +88,7 @@ bool MacroFile::commit()
     import << QString::fromLatin1("import FreeCAD");
     QStringList body;
 
-    for (const auto& it : qAsConst(this->macroInProgress)) {
+    for (const auto& it : std::as_const(this->macroInProgress)) {
         if (it.startsWith(QLatin1String("import ")) ||
             it.startsWith(QLatin1String("#import "))) {
             if (import.indexOf(it) == -1)
@@ -111,7 +111,7 @@ bool MacroFile::commit()
 
     // write the data to the text file
     str << header;
-    for (const auto& it : qAsConst(import)) {
+    for (const auto& it : std::as_const(import)) {
         str << it << QLatin1Char('\n');
     }
     str << QLatin1Char('\n');
diff --git a/src/Gui/ToolBarManager.cpp b/src/Gui/ToolBarManager.cpp
index 210ca41f29cf..116ea85f232c 100644
--- a/src/Gui/ToolBarManager.cpp
+++ b/src/Gui/ToolBarManager.cpp
@@ -74,7 +74,7 @@ ToolBarItem* ToolBarItem::findItem(const std::string& name)
         return this;
     }
 
-    for (auto it : qAsConst(_items)) {
+    for (auto it : std::as_const(_items)) {
         if (it->_name == name) {
             return it;
         }
@@ -127,7 +127,7 @@ void ToolBarItem::removeItem(ToolBarItem* item)
 
 void ToolBarItem::clear()
 {
-    for (auto it : qAsConst(_items)) {
+    for (auto it : std::as_const(_items)) {
         delete it;
     }
 
diff --git a/src/Mod/Sketcher/Gui/EditDatumDialog.cpp b/src/Mod/Sketcher/Gui/EditDatumDialog.cpp
index ceae48c4ef14..7ac544d016de 100644
--- a/src/Mod/Sketcher/Gui/EditDatumDialog.cpp
+++ b/src/Mod/Sketcher/Gui/EditDatumDialog.cpp
@@ -264,7 +264,7 @@ void EditDatumDialog::drivingToggled(bool state)
 
 void EditDatumDialog::datumChanged()
 {
-    if (ui_ins_datum->labelEdit->text() != qAsConst(ui_ins_datum->labelEdit)->getHistory()[0]) {
+    if (ui_ins_datum->labelEdit->text() != std::as_const(ui_ins_datum->labelEdit)->getHistory()[0]) {
         ui_ins_datum->cbDriving->setChecked(false);
     }
 }