diff --git a/src/blackmisc/nwaircraftmodel.cpp b/src/blackmisc/nwaircraftmodel.cpp
index 04e33b939..6eab49564 100644
--- a/src/blackmisc/nwaircraftmodel.cpp
+++ b/src/blackmisc/nwaircraftmodel.cpp
@@ -44,7 +44,7 @@ namespace BlackMisc
          */
         CVariant CAircraftModel::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
         {
-            if (index.isMyself()) { return this->toQVariant(); }
+            if (index.isMyself()) { return this->toCVariant(); }
             ColumnIndex i = index.frontCasted<ColumnIndex>();
             switch (i)
             {
diff --git a/src/blacksim/fscommon/aircraftcfgentrieslist.cpp b/src/blacksim/fscommon/aircraftcfgentrieslist.cpp
index c2a38b76a..8570fd9fc 100644
--- a/src/blacksim/fscommon/aircraftcfgentrieslist.cpp
+++ b/src/blacksim/fscommon/aircraftcfgentrieslist.cpp
@@ -52,7 +52,7 @@ namespace BlackSim
             QStringList titles = this->getTitles(true);
             QStringList ambiguousTitles;
             QString last;
-            foreach(QString title, titles)
+            for (const QString &title : titles)
             {
                 if (title.isEmpty()) { continue; }
                 if (title.compare(last, Qt::CaseInsensitive) == 0)
@@ -116,7 +116,7 @@ namespace BlackSim
             // Dirs last is crucial,since I will break recursion on "aircraft.cfg" level
             QFileInfoList files = dir.entryInfoList(QDir::Files | QDir::AllDirs, QDir::DirsLast);
 
-            foreach(QFileInfo file, files)
+            for (const QFileInfo &file : files)
             {
                 if (m_cancelRead) { return -1; }
                 if (file.isDir())
diff --git a/src/blacksim/fscommon/vpilotmodelmappings.cpp b/src/blacksim/fscommon/vpilotmodelmappings.cpp
index f35d2f848..7f8d1012c 100644
--- a/src/blacksim/fscommon/vpilotmodelmappings.cpp
+++ b/src/blacksim/fscommon/vpilotmodelmappings.cpp
@@ -40,7 +40,7 @@ namespace BlackSim
             if (!dir.exists()) return;
             QStringList nameFilters({"*.vmr"});
             QFileInfoList entries = dir.entryInfoList(nameFilters, QDir::Files | QDir::Readable);
-            foreach(QFileInfo file, entries)
+            for (const QFileInfo &file : entries)
             {
                 this->addFilename(file.absoluteFilePath());
             }
@@ -63,7 +63,7 @@ namespace BlackSim
             bool success = true;
             this->m_loadedFiles = 0;
             this->m_fileListWithProblems.clear();
-            foreach(QString fn, this->m_fileList)
+            for (const QString &fn : this->m_fileList)
             {
                 this->m_loadedFiles++;
                 bool s = this->loadFile(fn);
@@ -108,8 +108,8 @@ namespace BlackSim
                 if (modelName.contains("//"))
                 {
                     // multiple models
-                    QStringList models = modelName.split("//");
-                    foreach(QString model, models)
+                    const QStringList models = modelName.split("//");
+                    for (const QString &model : models)
                     {
                         if (model.isEmpty()) { continue; }
                         CAircraftMapping mapping("vpilot", folder, typeCode, airlineCode, model);
diff --git a/src/blacksim/simulatormodelmappings.cpp b/src/blacksim/simulatormodelmappings.cpp
index 683e5b0d5..74466aaec 100644
--- a/src/blacksim/simulatormodelmappings.cpp
+++ b/src/blacksim/simulatormodelmappings.cpp
@@ -36,7 +36,7 @@ namespace BlackSim
     {
         if (modelNames.isEmpty() || this->m_mappings.isEmpty()) { return this->m_mappings.size(); }
         CAircraftMappingList newList;
-        foreach(CAircraftMapping mapping, this->m_mappings)
+        for (const CAircraftMapping &mapping : this->m_mappings)
         {
             QString modelString = mapping.getModel().getModelString();
             if (modelString.isEmpty()) { continue; }
diff --git a/src/plugins/simulator/fsx/simulator_fsx.cpp b/src/plugins/simulator/fsx/simulator_fsx.cpp
index 5608444d2..b8f929160 100644
--- a/src/plugins/simulator/fsx/simulator_fsx.cpp
+++ b/src/plugins/simulator/fsx/simulator_fsx.cpp
@@ -584,7 +584,7 @@ namespace BlackSimPlugin
 
         void CSimulatorFsx::updateOtherAircraft()
         {
-            foreach(CSimConnectObject simObj, m_simConnectObjects)
+            for (const CSimConnectObject &simObj : m_simConnectObjects)
             {
                 if (simObj.getInterpolator()->hasEnoughAircraftSituations())
                 {