diff --git a/src/blackcore/aircraftmatcher.cpp b/src/blackcore/aircraftmatcher.cpp
index 7aff60b54..931e73b14 100644
--- a/src/blackcore/aircraftmatcher.cpp
+++ b/src/blackcore/aircraftmatcher.cpp
@@ -613,8 +613,8 @@ namespace BlackCore
 
     QString CAircraftMatcher::reverseLookupAirlineName(const QString &candidate, const CCallsign &callsign, CStatusMessageList *log)
     {
-        if (!sApp || sApp->isShuttingDown() || !sApp->hasWebDataServices()) { return ""; }
-        if (candidate.isEmpty()) { return ""; }
+        if (!sApp || sApp->isShuttingDown() || !sApp->hasWebDataServices()) { return {}; }
+        if (candidate.isEmpty()) { return {}; }
         const QStringList names = sApp->getWebDataServices()->getAirlineNames();
         if (names.contains(candidate, Qt::CaseInsensitive))
         {
@@ -623,13 +623,13 @@ namespace BlackCore
         }
 
         CMatchingUtils::addLogDetailsToList(log, callsign, QString("Airline name '%1' not found in DB").arg(candidate));
-        return "";
+        return {};
     }
 
     QString CAircraftMatcher::reverseLookupTelephonyDesignator(const QString &candidate, const CCallsign &callsign, CStatusMessageList *log)
     {
-        if (!sApp || sApp->isShuttingDown() || !sApp->hasWebDataServices()) { return ""; }
-        if (candidate.isEmpty()) { return ""; }
+        if (!sApp || sApp->isShuttingDown() || !sApp->hasWebDataServices()) { return {}; }
+        if (candidate.isEmpty()) { return {}; }
         const QStringList designators = sApp->getWebDataServices()->getTelephonyDesignators();
         if (designators.contains(candidate, Qt::CaseInsensitive))
         {
@@ -638,7 +638,7 @@ namespace BlackCore
         }
 
         CMatchingUtils::addLogDetailsToList(log, callsign, QString("Airline name '%1' not found").arg(candidate));
-        return "";
+        return {};
     }
 
     bool CAircraftMatcher::isKnowAircraftDesignator(const QString &candidate, const CCallsign &callsign, CStatusMessageList *log)
@@ -1291,7 +1291,7 @@ namespace BlackCore
 
     QString CAircraftMatcher::scoresToString(const ScoredModels &scores, int lastElements)
     {
-        if (scores.isEmpty()) { return ""; }
+        if (scores.isEmpty()) { return {}; }
         QMapIterator<int, CAircraftModel> i(scores);
         i.toBack();
         int c = 0;
diff --git a/src/blackcore/application.cpp b/src/blackcore/application.cpp
index 82de9891e..d982dcf2e 100644
--- a/src/blackcore/application.cpp
+++ b/src/blackcore/application.cpp
@@ -284,14 +284,14 @@ namespace BlackCore
         case CApplicationInfo::PilotClientGui:  searchFor = "gui"; break;
         default: break;
         }
-        if (searchFor.isEmpty()) { return ""; }
+        if (searchFor.isEmpty()) { return {}; }
 
         for (const QString &executable : CFileUtils::getSwiftExecutables())
         {
             if (!executable.contains("swift", Qt::CaseInsensitive)) { continue; }
             if (executable.contains(searchFor, Qt::CaseInsensitive)) { return executable; }
         }
-        return "";
+        return {};
     }
 
     bool CApplication::startLauncher()
@@ -1283,7 +1283,7 @@ namespace BlackCore
 
     QString CApplication::getCmdDBusAddressValue() const
     {
-        if (!this->isParserOptionSet(m_cmdDBusAddress)) { return ""; }
+        if (!this->isParserOptionSet(m_cmdDBusAddress)) { return {}; }
         const QString v(this->getParserValue(m_cmdDBusAddress));
         const QString dBusAddress(CDBusServer::normalizeAddress(v));
         return dBusAddress;
@@ -1407,7 +1407,7 @@ namespace BlackCore
     {
         QStringList args = QCoreApplication::arguments();
         if (!withExecutable && !args.isEmpty()) args.removeFirst();
-        if (args.isEmpty()) return "";
+        if (args.isEmpty()) return {};
         return args.join(' ');
     }
 
@@ -1556,13 +1556,13 @@ namespace BlackCore
 
     QString CApplication::getLastSuccesfulSetupUrl() const
     {
-        if (!this->hasSetupReader()) { return ""; }
+        if (!this->hasSetupReader()) { return {}; }
         return m_setupReader->getLastSuccessfulSetupUrl();
     }
 
     QString CApplication::getLastSuccesfulDistributionUrl() const
     {
-        if (!this->hasSetupReader()) { return ""; }
+        if (!this->hasSetupReader()) { return {}; }
         return m_setupReader->getLastSuccessfulUpdateInfoUrl();
     }
 
diff --git a/src/blackcore/context/contextapplicationproxy.cpp b/src/blackcore/context/contextapplicationproxy.cpp
index 9249387db..2002711f5 100644
--- a/src/blackcore/context/contextapplicationproxy.cpp
+++ b/src/blackcore/context/contextapplicationproxy.cpp
@@ -197,7 +197,7 @@ namespace BlackCore
 
         QString CContextApplicationProxy::readFromFile(const QString &fileName) const
         {
-            if (fileName.isEmpty()) { return ""; }
+            if (fileName.isEmpty()) { return {}; }
             return m_dBusInterface->callDBusRet<QString>(QLatin1String("readFromFile"), fileName);
         }
 
diff --git a/src/blackcore/coremodeenums.h b/src/blackcore/coremodeenums.h
index 76f2e55a2..820a0a9f1 100644
--- a/src/blackcore/coremodeenums.h
+++ b/src/blackcore/coremodeenums.h
@@ -50,11 +50,11 @@ namespace BlackCore
         {
             switch (mode)
             {
-            case CoreInGuiProcess: return "coreinguiprocess";
-            case CoreExternalCoreAudio: return "coreexternal";
-            case CoreExternalAudioGui: return "coreexternalaudiogui";
+            case CoreInGuiProcess: return QStringLiteral("coreinguiprocess");
+            case CoreExternalCoreAudio: return QStringLiteral("coreexternal");
+            case CoreExternalAudioGui: return QStringLiteral("coreexternalaudiogui");
             }
-            return "";
+            return {};
         }
     };
 }
diff --git a/src/blackcore/data/globalsetup.cpp b/src/blackcore/data/globalsetup.cpp
index 1f84f61c0..43ce530c0 100644
--- a/src/blackcore/data/globalsetup.cpp
+++ b/src/blackcore/data/globalsetup.cpp
@@ -201,7 +201,7 @@ namespace BlackCore
 
         QString CGlobalSetup::buildBootstrapFileUrl(const QString &candidate)
         {
-            if (candidate.isEmpty()) return ""; // not possible
+            if (candidate.isEmpty()) return {}; // not possible
             static const QString version(QString(CGlobalSetup::schemaVersionString()).append("/"));
             if (candidate.endsWith(CDirectoryUtils::bootstrapFileName())) { return candidate; }
             CUrl url(candidate);
diff --git a/src/blackcore/db/databasereader.cpp b/src/blackcore/db/databasereader.cpp
index c0c2a4873..fe04144e9 100644
--- a/src/blackcore/db/databasereader.cpp
+++ b/src/blackcore/db/databasereader.cpp
@@ -688,7 +688,7 @@ namespace BlackCore
 
         QString CDatabaseReader::dateTimeToDbLatestTs(const QDateTime &ts)
         {
-            if (!ts.isValid()) { return ""; }
+            if (!ts.isValid()) { return {}; }
             return ts.toUTC().toString(Qt::ISODate);
         }
 
@@ -709,7 +709,7 @@ namespace BlackCore
 
         QString CDatabaseReader::queryLatestTimestamp(const QDateTime &ts)
         {
-            if (!ts.isValid()) return "";
+            if (!ts.isValid()) return {};
             const QString q = parameterLatestTimestamp() + "=" + dateTimeToDbLatestTs(ts);
             return q;
         }
diff --git a/src/blackcore/setupreader.cpp b/src/blackcore/setupreader.cpp
index 459c683fe..149026afd 100644
--- a/src/blackcore/setupreader.cpp
+++ b/src/blackcore/setupreader.cpp
@@ -541,7 +541,7 @@ namespace BlackCore
 
     QString CSetupReader::getCmdLineBootstrapUrl() const
     {
-        if (m_ignoreCmdBootstrapUrl) return "";
+        if (m_ignoreCmdBootstrapUrl) return {};
         return sApp->getParserValue(m_cmdBootstrapUrl);
     }
 
@@ -635,12 +635,12 @@ namespace BlackCore
     {
         switch (m_bootstrapMode)
         {
-        case CacheOnly: return "cache only";
-        case Explicit:  return "explicit";
-        case Implicit:  return "implicit";
+        case CacheOnly: return QStringLiteral("cache only");
+        case Explicit:  return QStringLiteral("explicit");
+        case Implicit:  return QStringLiteral("implicit");
         default: break;
         }
-        return "";
+        return {};
     }
 
     void CSetupReader::setLastSetupReadErrorMessages(const CStatusMessageList &messages)
diff --git a/src/blackgui/components/dbliveryselectorcomponent.cpp b/src/blackgui/components/dbliveryselectorcomponent.cpp
index 7ee57b61c..1347c977c 100644
--- a/src/blackgui/components/dbliveryselectorcomponent.cpp
+++ b/src/blackgui/components/dbliveryselectorcomponent.cpp
@@ -226,7 +226,7 @@ namespace BlackGui
 
         QString CDbLiverySelectorComponent::stripExtraInfo(const QString &liveryCode) const
         {
-            if (liveryCode.isEmpty()) { return ""; }
+            if (liveryCode.isEmpty()) { return {}; }
             const QString l(liveryCode.trimmed().toUpper());
             int is = l.indexOf(' ');
             int ib = l.indexOf('(');
diff --git a/src/blackgui/components/dbownmodelscomponent.cpp b/src/blackgui/components/dbownmodelscomponent.cpp
index 076c3c982..3c1136bbe 100644
--- a/src/blackgui/components/dbownmodelscomponent.cpp
+++ b/src/blackgui/components/dbownmodelscomponent.cpp
@@ -166,13 +166,13 @@ namespace BlackGui
 
         QString CDbOwnModelsComponent::getInfoString() const
         {
-            if (!m_modelLoader) { return ""; }
+            if (!m_modelLoader) { return {}; }
             return m_modelLoader->getInfoString();
         }
 
         QString CDbOwnModelsComponent::getInfoStringFsFamily() const
         {
-            if (!m_modelLoader) { return ""; }
+            if (!m_modelLoader) { return {}; }
             return m_modelLoader->getInfoStringFsFamily();
         }
 
diff --git a/src/blackgui/components/dbusserveraddressselector.cpp b/src/blackgui/components/dbusserveraddressselector.cpp
index 19a9cf0b3..6b47abc2c 100644
--- a/src/blackgui/components/dbusserveraddressselector.cpp
+++ b/src/blackgui/components/dbusserveraddressselector.cpp
@@ -50,7 +50,7 @@ namespace BlackGui
 
         QString CDBusServerAddressSelector::getP2PAddress() const
         {
-            if (!this->isP2P()) { return ""; }
+            if (!this->isP2P()) { return {}; }
             return CDBusServer::p2pAddress(
                        ui->cb_DBusServerAddress->currentText() + ":" +
                        ui->le_DBusServerPort->text()
diff --git a/src/blackgui/components/flightplancomponent.cpp b/src/blackgui/components/flightplancomponent.cpp
index 3a4b7ecb8..68cd4b39c 100644
--- a/src/blackgui/components/flightplancomponent.cpp
+++ b/src/blackgui/components/flightplancomponent.cpp
@@ -370,7 +370,7 @@ namespace BlackGui
             if (v.isEmpty() || v.endsWith(defaultIcao(), Qt::CaseInsensitive))
             {
                 messages.push_back(CStatusMessage(this).validationError("Missing '%1'") << ui->lbl_DestinationAirport->text());
-                flightPlan.setDestinationAirportIcao(QString(""));
+                flightPlan.setDestinationAirportIcao(QString());
             }
             else
             {
@@ -411,7 +411,7 @@ namespace BlackGui
                 {
                     messages.push_back(CStatusMessage(this).validationInfo("Missing %1") << ui->lbl_AlternateAirport->text());
                 }
-                flightPlan.setAlternateAirportIcao(QString(""));
+                flightPlan.setAlternateAirportIcao(QString());
             }
             else
             {
diff --git a/src/blackgui/components/textmessagecomponent.cpp b/src/blackgui/components/textmessagecomponent.cpp
index 0adcbc141..1e578631a 100644
--- a/src/blackgui/components/textmessagecomponent.cpp
+++ b/src/blackgui/components/textmessagecomponent.cpp
@@ -532,7 +532,7 @@ namespace BlackGui
         QString CTextMessageComponent::textMessageToCommand(const QString &enteredLine)
         {
             // only if visible
-            if (enteredLine.isEmpty()) { return ""; }
+            if (enteredLine.isEmpty()) { return {}; }
 
             const int index = ui->tw_TextMessages->currentIndex();
             QString cmd(".msg ");
diff --git a/src/blackgui/guiapplication.cpp b/src/blackgui/guiapplication.cpp
index 243c69c8c..2a390d50f 100644
--- a/src/blackgui/guiapplication.cpp
+++ b/src/blackgui/guiapplication.cpp
@@ -378,7 +378,7 @@ namespace BlackGui
     QString CGuiApplication::beautifyHelpMessage(const QString &helpText)
     {
         // just formatting Qt help message into HTML table
-        if (helpText.isEmpty()) { return ""; }
+        if (helpText.isEmpty()) { return {}; }
         const QStringList lines(helpText.split('\n'));
         QString html;
         bool tableMode = false;
diff --git a/src/blackgui/menus/menuaction.cpp b/src/blackgui/menus/menuaction.cpp
index 7d718852e..2ca1a5035 100644
--- a/src/blackgui/menus/menuaction.cpp
+++ b/src/blackgui/menus/menuaction.cpp
@@ -123,11 +123,11 @@ namespace BlackGui
         {
             if (m_path.contains('/'))
             {
-                if (m_path.endsWith('/')) { return ""; }
+                if (m_path.endsWith('/')) { return {}; }
                 const int i = m_path.lastIndexOf('/');
                 return m_path.mid(i + 1);
             }
-            return "";
+            return {};
         }
 
         void CMenuActions::splitSubMenus(const QString &key, QList<CMenuAction> &actions, QList<CMenuAction> &menus) const
@@ -546,7 +546,7 @@ namespace BlackGui
 
         QString CMenuActions::parentPath(const QString &currentPath)
         {
-            if (!currentPath.contains('/')) { return ""; }
+            if (!currentPath.contains('/')) { return {}; }
             const int i = currentPath.lastIndexOf('/');
             return currentPath.left(i);
         }
@@ -554,7 +554,7 @@ namespace BlackGui
         QString CMenuActions::keyRoot(const QString &key)
         {
             const int i = key.lastIndexOf('.');
-            if (i < 0) { return ""; }
+            if (i < 0) { return {}; }
             return key.left(i);
         }
 
diff --git a/src/blackgui/models/columnformatters.cpp b/src/blackgui/models/columnformatters.cpp
index fc0f61e8d..02595f0db 100644
--- a/src/blackgui/models/columnformatters.cpp
+++ b/src/blackgui/models/columnformatters.cpp
@@ -163,7 +163,7 @@ namespace BlackGui
 
         CVariant CPixmapFormatter::tooltipRole(const CVariant &dataCVariant) const
         {
-            if (dataCVariant.isNull()) return "";
+            if (dataCVariant.isNull()) return {};
             if (dataCVariant.canConvert<BlackMisc::CIcon>())
             {
                 BlackMisc::CIcon icon = dataCVariant.value<BlackMisc::CIcon>();
@@ -190,7 +190,7 @@ namespace BlackGui
 
         CVariant CDateTimeFormatter::displayRole(const CVariant &dateTime) const
         {
-            if (dateTime.isNull()) return "";
+            if (dateTime.isNull()) return {};
             if (static_cast<QMetaType::Type>(dateTime.type()) == QMetaType::QDateTime)
             {
                 const QDateTime dt = dateTime.value<QDateTime>();
@@ -214,7 +214,7 @@ namespace BlackGui
             else
             {
                 Q_ASSERT_X(false, "formatQVariant", "No QDate, QTime or QDateTime");
-                return "";
+                return {};
             }
         }
 
diff --git a/src/blackgui/textmessagetextedit.cpp b/src/blackgui/textmessagetextedit.cpp
index 87f62825d..b60bd5f1d 100644
--- a/src/blackgui/textmessagetextedit.cpp
+++ b/src/blackgui/textmessagetextedit.cpp
@@ -99,7 +99,7 @@ namespace BlackGui
 
     QString CTextMessageTextEdit::toHtml(const CTextMessageList &messages, bool withFrom, bool withTo)
     {
-        if (messages.isEmpty()) { return ""; }
+        if (messages.isEmpty()) { return {}; }
         QString html("<table>");
         for (const CTextMessage &msg : messages)
         {
diff --git a/src/blackmisc/audio/voiceroom.cpp b/src/blackmisc/audio/voiceroom.cpp
index 942af16b1..c00c4c6e2 100644
--- a/src/blackmisc/audio/voiceroom.cpp
+++ b/src/blackmisc/audio/voiceroom.cpp
@@ -84,7 +84,7 @@ namespace BlackMisc
 
         QString CVoiceRoom::getVoiceRoomUrl(bool noProtocol) const
         {
-            if (!this->isValid()) return "";
+            if (!this->isValid()) return {};
             QString url(noProtocol ? "" : CVoiceRoom::protocolComplete());
             url.append(this->m_hostname);
             url.append("/");
diff --git a/src/blackmisc/aviation/aircrafticaocode.cpp b/src/blackmisc/aviation/aircrafticaocode.cpp
index 4c4988819..a9f214419 100644
--- a/src/blackmisc/aviation/aircrafticaocode.cpp
+++ b/src/blackmisc/aviation/aircrafticaocode.cpp
@@ -298,7 +298,7 @@ namespace BlackMisc
 
         QString CAircraftIcaoCode::getEngineType() const
         {
-            if (m_combinedType.length() != 3) return "";
+            if (m_combinedType.length() != 3) return {};
             return m_combinedType.right(1);
         }
 
@@ -322,15 +322,15 @@ namespace BlackMisc
 
         QString CAircraftIcaoCode::getEngineCountString() const
         {
-            if (m_combinedType.length() < 2) { return ""; }
+            if (m_combinedType.length() < 2) { return {}; }
             return m_combinedType.mid(1, 1);
         }
 
         QString CAircraftIcaoCode::getAircraftType() const
         {
-            if (m_combinedType.length() < 1) { return ""; }
+            if (m_combinedType.length() < 1) { return {}; }
             QString c(m_combinedType.at(0));
-            if (c == "-") { return ""; }
+            if (c == "-") { return {}; }
             return c;
         }
 
@@ -477,7 +477,7 @@ namespace BlackMisc
 
         QString CAircraftIcaoCode::getCombinedIataStringWithKey() const
         {
-            if (!this->hasIataCode()) { return ""; }
+            if (!this->hasIataCode()) { return {}; }
             return this->getIataCode() % u" [IATA" %
                    (this->hasDesignator() ? (u' ' % this->getDesignator()) : QString()) %
                    (this->hasManufacturer() ? (u' ' % this->getManufacturer()) : QString()) %
@@ -487,7 +487,7 @@ namespace BlackMisc
 
         QString CAircraftIcaoCode::getCombinedFamilyStringWithKey() const
         {
-            if (!this->hasFamily()) { return ""; }
+            if (!this->hasFamily()) { return {}; }
             return this->getFamily() % u" [family" %
                    (this->hasDesignator() ? (u' ' % this->getDesignator()) : QString()) %
                    (this->hasManufacturer() ? (u' ' % this->getManufacturer()) : QString()) %
diff --git a/src/blackmisc/aviation/airporticaocode.cpp b/src/blackmisc/aviation/airporticaocode.cpp
index 51b3b784f..bb1003cf6 100644
--- a/src/blackmisc/aviation/airporticaocode.cpp
+++ b/src/blackmisc/aviation/airporticaocode.cpp
@@ -29,8 +29,8 @@ namespace BlackMisc
         QString CAirportIcaoCode::unifyAirportCode(const QString &icaoCode)
         {
             const QString code = icaoCode.trimmed().toUpper();
-            if (code.length() != 4) return "";
-            if (containsChar(code, [](QChar c) { return !c.isLetterOrNumber(); })) { return ""; }
+            if (code.length() != 4) return {};
+            if (containsChar(code, [](QChar c) { return !c.isLetterOrNumber(); })) { return {}; }
             return code;
         }
 
diff --git a/src/blackmisc/aviation/callsign.cpp b/src/blackmisc/aviation/callsign.cpp
index 45cdca2d3..1501c170e 100644
--- a/src/blackmisc/aviation/callsign.cpp
+++ b/src/blackmisc/aviation/callsign.cpp
@@ -149,7 +149,7 @@ namespace BlackMisc
 
         QString CCallsign::getAsObserverCallsignString() const
         {
-            if (this->isEmpty()) { return ""; }
+            if (this->isEmpty()) { return {}; }
             QString obs = this->getStringAsSet();
             if (obs.endsWith("_OBS", Qt::CaseInsensitive)) { return obs; } // already OBS
             if (obs.contains('_')) { obs = obs.left(obs.lastIndexOf('_')); }
@@ -168,8 +168,8 @@ namespace BlackMisc
 
         QString CCallsign::getAirlineSuffix() const
         {
-            if (m_callsign.length() < 3) { return ""; }
-            if (this->isAtcCallsign()) { return ""; }
+            if (m_callsign.length() < 3) { return {}; }
+            if (this->isAtcCallsign()) { return {}; }
 
             thread_local const QRegularExpression regExp("^[A-Z]{3,}");
             QRegularExpressionMatch match = regExp.match(m_callsign);
@@ -184,7 +184,7 @@ namespace BlackMisc
             const QString number = match.captured(1);
             if (number.length() >= 3 && airline.length() == 4) { return airline.left(3); }
 
-            return ""; // invalid
+            return {}; // invalid
         }
 
         bool CCallsign::hasSuffix() const
diff --git a/src/blackmisc/aviation/flightplan.cpp b/src/blackmisc/aviation/flightplan.cpp
index c44046819..2e0a4dc13 100644
--- a/src/blackmisc/aviation/flightplan.cpp
+++ b/src/blackmisc/aviation/flightplan.cpp
@@ -130,9 +130,9 @@ namespace BlackMisc
         {
             const int maxIndex = remarks.size() - 1;
             int f = remarks.indexOf(marker);
-            if (f < 0) { return ""; }
+            if (f < 0) { return {}; }
             f += marker.length();
-            if (maxIndex <= f) { return ""; }
+            if (maxIndex <= f) { return {}; }
 
             // the remarks are poorly formatted:
             // 1) sometimes the values are enclosed in "/", like "/REG/D-AMBZ/"
diff --git a/src/blackmisc/aviation/selcal.cpp b/src/blackmisc/aviation/selcal.cpp
index b1242735f..323036229 100644
--- a/src/blackmisc/aviation/selcal.cpp
+++ b/src/blackmisc/aviation/selcal.cpp
@@ -33,7 +33,7 @@ namespace BlackMisc
             {
                 if (CSelcal::isValidCharacter(c)) { s += c;}
             }
-            return CSelcal::isValidCode(s) ? s : QString("");
+            return CSelcal::isValidCode(s) ? s : QString();
         }
 
         bool CSelcal::equalsString(const QString &code) const
diff --git a/src/blackmisc/cachesettingsutils.cpp b/src/blackmisc/cachesettingsutils.cpp
index 285d3aaec..89ecfce59 100644
--- a/src/blackmisc/cachesettingsutils.cpp
+++ b/src/blackmisc/cachesettingsutils.cpp
@@ -79,19 +79,19 @@ namespace BlackMisc
     QString CCacheSettingsUtils::otherVersionFileName(const CApplicationInfo &info, const QString &relativeFileName)
     {
         thread_local const QRegularExpression re("bin$");
-        if (relativeFileName.isEmpty()) { return ""; }
+        if (relativeFileName.isEmpty()) { return {}; }
         QString otherFile = info.getApplicationDataDirectory();
         otherFile.replace(re, relativeFileName);
         const QFileInfo fi(otherFile);
-        if (!fi.isFile()) { return ""; }
+        if (!fi.isFile()) { return {}; }
         if (fi.exists()) { return fi.absoluteFilePath(); }
-        return "";
+        return {};
     }
 
     QString CCacheSettingsUtils::otherVersionSettingsFileContent(const CApplicationInfo &info, const QString &mySettingFile)
     {
         const QString file = otherVersionSettingsFileName(info, mySettingFile);
-        if (file.isEmpty()) { return ""; }
+        if (file.isEmpty()) { return {}; }
         const QString jsonStr = CFileUtils::readFileToString(file);
         return jsonStr;
     }
@@ -99,7 +99,7 @@ namespace BlackMisc
     QString CCacheSettingsUtils::otherVersionCacheFileContent(const CApplicationInfo &info, const QString &myCacheFile)
     {
         const QString file = otherVersionCacheFileName(info, myCacheFile);
-        if (file.isEmpty()) { return ""; }
+        if (file.isEmpty()) { return {}; }
         const QString jsonStr = CFileUtils::readFileToString(file);
         return jsonStr;
     }
diff --git a/src/blackmisc/db/datastore.cpp b/src/blackmisc/db/datastore.cpp
index 473713591..142a311bd 100644
--- a/src/blackmisc/db/datastore.cpp
+++ b/src/blackmisc/db/datastore.cpp
@@ -150,7 +150,7 @@ namespace BlackMisc
 
         QString IDatastoreObjectWithStringKey::getDbKeyAsStringInParentheses(const QString &prefix) const
         {
-            if (m_dbKey.isEmpty()) { return ""; }
+            if (m_dbKey.isEmpty()) { return {}; }
             return prefix % '(' % m_dbKey % ')';
         }
 
diff --git a/src/blackmisc/db/datastore.h b/src/blackmisc/db/datastore.h
index 1fa962fa7..701bddf9c 100644
--- a/src/blackmisc/db/datastore.h
+++ b/src/blackmisc/db/datastore.h
@@ -171,7 +171,7 @@ namespace BlackMisc
             const CIcon &toDatabaseIcon() const;
 
             //! Invalid key
-            static QString invalidDbKey() { return ""; }
+            static QString invalidDbKey() { return {}; }
 
         protected:
             //! Constructor
diff --git a/src/blackmisc/db/datastoreobjectlist.cpp b/src/blackmisc/db/datastoreobjectlist.cpp
index 05b68387f..d6280dae8 100644
--- a/src/blackmisc/db/datastoreobjectlist.cpp
+++ b/src/blackmisc/db/datastoreobjectlist.cpp
@@ -134,7 +134,7 @@ namespace BlackMisc
         template<class OBJ, class CONTAINER, typename KEYTYPE>
         QString IDatastoreObjectList<OBJ, CONTAINER, KEYTYPE>::dbKeysAsString(const QString &separator) const
         {
-            if (ITimestampObjectList<OBJ, CONTAINER>::container().isEmpty()) { return ""; }
+            if (ITimestampObjectList<OBJ, CONTAINER>::container().isEmpty()) { return {}; }
             const QSet<QString> keys = IDatastoreObjectList<OBJ, CONTAINER, KEYTYPE>::toDbKeyStringSet();
             QString s;
             for (const QString &k : keys)
diff --git a/src/blackmisc/dbusserver.cpp b/src/blackmisc/dbusserver.cpp
index da87fd4a1..0e9160218 100644
--- a/src/blackmisc/dbusserver.cpp
+++ b/src/blackmisc/dbusserver.cpp
@@ -171,7 +171,7 @@ namespace BlackMisc
 
     QString CDBusServer::getDBusInterfaceFromClassInfo(QObject *object)
     {
-        if (! object) { return ""; }
+        if (! object) { return {}; }
         const QMetaObject *mo = object->metaObject();
         for (int i = 0; i < mo->classInfoCount(); i++)
         {
@@ -179,7 +179,7 @@ namespace BlackMisc
             const QString name = QString(ci.name()).toLower();
             if (name == "d-bus interface") { return QString(ci.value()); }
         }
-        return "";
+        return {};
     }
 
     QDBusConnection::RegisterOptions CDBusServer::registerOptions()
diff --git a/src/blackmisc/directoryutils.cpp b/src/blackmisc/directoryutils.cpp
index 337212af4..96a7467fc 100644
--- a/src/blackmisc/directoryutils.cpp
+++ b/src/blackmisc/directoryutils.cpp
@@ -209,7 +209,7 @@ namespace BlackMisc
             return dir.absolutePath();
         }
         Q_ASSERT_X(false, Q_FUNC_INFO, "missing dir");
-        return "";
+        return {};
     }
 
     const QString &CDirectoryUtils::shareDirectory()
@@ -239,7 +239,7 @@ namespace BlackMisc
     const QString getBootstrapResourceFileImpl()
     {
         const QString d(CDirectoryUtils::shareDirectory());
-        if (d.isEmpty()) { return ""; }
+        if (d.isEmpty()) { return {}; }
         const QFile file(QDir::cleanPath(d + QDir::separator() + "shared/bootstrap/" + CDirectoryUtils::bootstrapFileName()));
         Q_ASSERT_X(file.exists(), Q_FUNC_INFO, "missing bootstrap file");
         return QFileInfo(file).absoluteFilePath();
@@ -254,7 +254,7 @@ namespace BlackMisc
     QString getSwiftStaticDbFilesDirImpl()
     {
         const QString d(CDirectoryUtils::shareDirectory());
-        if (d.isEmpty()) { return ""; }
+        if (d.isEmpty()) { return {}; }
         const QDir dir(QDir::cleanPath(d + QDir::separator() + "shared/dbdata"));
         Q_ASSERT_X(dir.exists(), Q_FUNC_INFO, "missing dir");
         return dir.absolutePath();
@@ -269,7 +269,7 @@ namespace BlackMisc
     QString getSoundFilesDirImpl()
     {
         const QString d(CDirectoryUtils::shareDirectory());
-        if (d.isEmpty()) { return ""; }
+        if (d.isEmpty()) { return {}; }
         const QDir dir(QDir::cleanPath(d + QDir::separator() + "sounds"));
         Q_ASSERT_X(dir.exists(), Q_FUNC_INFO, "missing dir");
         return dir.absolutePath();
@@ -284,7 +284,7 @@ namespace BlackMisc
     QString getStylesheetsDirImpl()
     {
         const QString d(CDirectoryUtils::shareDirectory());
-        if (d.isEmpty()) { return ""; }
+        if (d.isEmpty()) { return {}; }
         const QDir dir(QDir::cleanPath(d + QDir::separator() + "qss"));
         Q_ASSERT_X(dir.exists(), Q_FUNC_INFO, "missing dir");
         return dir.absolutePath();
@@ -359,7 +359,7 @@ namespace BlackMisc
     QString testFilesDirImpl()
     {
         const QString d(CDirectoryUtils::shareDirectory());
-        if (d.isEmpty()) { return ""; }
+        if (d.isEmpty()) { return {}; }
         const QDir dir(QDir::cleanPath(d + QDir::separator() + "test"));
         Q_ASSERT_X(dir.exists(), Q_FUNC_INFO, "missing dir");
         return dir.absolutePath();
diff --git a/src/blackmisc/fileutils.cpp b/src/blackmisc/fileutils.cpp
index 4850726d2..792db123b 100644
--- a/src/blackmisc/fileutils.cpp
+++ b/src/blackmisc/fileutils.cpp
@@ -75,7 +75,7 @@ namespace BlackMisc
     QString CFileUtils::readFileToString(const QString &fileNameAndPath)
     {
         QFile file(fileNameAndPath);
-        if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { return ""; }
+        if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { return {}; }
         QTextStream stream(&file);
         QString content(stream.readAll());
         file.close();
@@ -196,7 +196,7 @@ namespace BlackMisc
 
     QString CFileUtils::normalizeFilePathToQtStandard(const QString &filePath)
     {
-        if (filePath.isEmpty()) { return ""; }
+        if (filePath.isEmpty()) { return {}; }
         QString n(filePath);
         n = n.replace('\\', '/').replace("//", "/");
         return n;
@@ -303,7 +303,7 @@ namespace BlackMisc
 
     QString CFileUtils::findFirstExisting(const QStringList &filesOrDirectory)
     {
-        if (filesOrDirectory.isEmpty()) { return ""; }
+        if (filesOrDirectory.isEmpty()) { return {}; }
         for (const QString &f : filesOrDirectory)
         {
             if (f.isEmpty()) { continue; }
@@ -311,7 +311,7 @@ namespace BlackMisc
             const QFileInfo fi(fn);
             if (fi.exists()) { return fi.absoluteFilePath(); }
         }
-        return "";
+        return {};
     }
 
     QString CFileUtils::findFirstFile(const QDir &dir, bool recursive, const QStringList &nameFilters, const QStringList &excludeDirectories, std::function<bool(const QFileInfo &)> predicate)
diff --git a/src/blackmisc/htmlutils.h b/src/blackmisc/htmlutils.h
index 7e999fd48..520b36ba1 100644
--- a/src/blackmisc/htmlutils.h
+++ b/src/blackmisc/htmlutils.h
@@ -22,7 +22,7 @@ namespace BlackMisc
     //! Container to standard HTML table
     template <class Obj, class Container> QString toHtmlTable(const CPropertyIndexList &indexes, const Container &container)
     {
-        if (indexes.isEmpty() || container.isEmpty()) { return ""; }
+        if (indexes.isEmpty() || container.isEmpty()) { return {}; }
         QString html;
         for (const Obj &obj : container)
         {
diff --git a/src/blackmisc/network/remotefile.cpp b/src/blackmisc/network/remotefile.cpp
index f90910fb8..ba055ed3d 100644
--- a/src/blackmisc/network/remotefile.cpp
+++ b/src/blackmisc/network/remotefile.cpp
@@ -72,7 +72,7 @@ namespace BlackMisc
 
         QString CRemoteFile::getFormattedCreatedYmdhms() const
         {
-            if (m_created < 1) { return ""; }
+            if (m_created < 1) { return {}; }
             const QDateTime dt = QDateTime::fromMSecsSinceEpoch(m_created);
             return dt.toString("yyyy-MM-dd HH:mm:ss");
         }
diff --git a/src/blackmisc/network/textmessage.cpp b/src/blackmisc/network/textmessage.cpp
index a9bb3c835..c707e1a91 100644
--- a/src/blackmisc/network/textmessage.cpp
+++ b/src/blackmisc/network/textmessage.cpp
@@ -94,7 +94,7 @@ namespace BlackMisc
         QString CTextMessage::getRecipientCallsignOrFrequency() const
         {
             if (!m_recipientCallsign.isEmpty()) { return m_recipientCallsign.asString(); }
-            if (m_frequency.isNull()) { return ""; }
+            if (m_frequency.isNull()) { return {}; }
             return m_frequency.valueRoundedWithUnit(CFrequencyUnit::MHz(), 3);
         }
 
diff --git a/src/blackmisc/network/url.cpp b/src/blackmisc/network/url.cpp
index e2f708e71..ede8afb67 100644
--- a/src/blackmisc/network/url.cpp
+++ b/src/blackmisc/network/url.cpp
@@ -109,7 +109,7 @@ namespace BlackMisc
 
         QString CUrl::getFullUrl(bool withQuery) const
         {
-            if (m_host.isEmpty()) { return ""; }
+            if (m_host.isEmpty()) { return {}; }
 
             QString qn(m_host);
             if (!hasDefaultPort() && hasPort()) { qn = qn.append(":").append(QString::number(m_port)); }
@@ -198,8 +198,8 @@ namespace BlackMisc
         {
             const QString f(this->getFileName());
             const int i = f.lastIndexOf('.');
-            if (i < 0) return "";
-            if (f.length() <= i + 1) return ""; // ends with "."
+            if (i < 0) return {};
+            if (f.length() <= i + 1) return {}; // ends with "."
             return f.mid(i + 1); // suffix without dot
         }
 
@@ -207,8 +207,8 @@ namespace BlackMisc
         {
             const QString f(this->getFileName());
             const int i = f.lastIndexOf('.');
-            if (i < 0) return "";
-            if (f.length() <= i + 1) return ""; // ends with "."
+            if (i < 0) return {};
+            if (f.length() <= i + 1) return {}; // ends with "."
             return f.mid(i);  // suffix with dot
         }
 
diff --git a/src/blackmisc/processinfo.cpp b/src/blackmisc/processinfo.cpp
index 3e55e88e6..674e669d1 100644
--- a/src/blackmisc/processinfo.cpp
+++ b/src/blackmisc/processinfo.cpp
@@ -47,18 +47,18 @@ namespace BlackMisc
     QString CProcessInfo::processNameFromId(qint64 pid)
     {
         HANDLE proc = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, static_cast<DWORD>(pid));
-        if (! proc) { return ""; }
+        if (! proc) { return {}; }
         wchar_t path[1024];
         auto len = GetModuleFileNameEx(proc, nullptr, path, std::extent<decltype(path)>::value);
         CloseHandle(proc);
-        if (len <= 0) { return ""; }
+        if (len <= 0) { return {}; }
         return QFileInfo(QString::fromWCharArray(path)).completeBaseName();
     }
 #else
     QString CProcessInfo::processNameFromId(qint64)
     {
         qFatal("Not implemented");
-        return "";
+        return {};
     }
 #endif
 
diff --git a/src/blackmisc/rgbcolor.cpp b/src/blackmisc/rgbcolor.cpp
index 5591533a8..cd2c228ee 100644
--- a/src/blackmisc/rgbcolor.cpp
+++ b/src/blackmisc/rgbcolor.cpp
@@ -17,6 +17,7 @@
 #include <QPainter>
 #include <QPixmap>
 #include <QSize>
+#include <QStringBuilder>
 #include <Qt>
 #include <QtGlobal>
 
@@ -127,9 +128,9 @@ namespace BlackMisc
 
     QString CRgbColor::hex(bool withHash) const
     {
-        if (!isValid()) { return ""; }
+        if (!isValid()) { return {}; }
         const QString h(redHex() + greenHex() + blueHex());
-        return withHash ? "#" + h : h;
+        return withHash ? u'#' % h : h;
     }
 
     void CRgbColor::setByString(const QString &color, bool isName)
diff --git a/src/blackmisc/sampleutils.cpp b/src/blackmisc/sampleutils.cpp
index be45773d0..58dadd8f9 100644
--- a/src/blackmisc/sampleutils.cpp
+++ b/src/blackmisc/sampleutils.cpp
@@ -17,7 +17,7 @@ namespace BlackMisc
     QString CSampleUtils::selectDirectory(const QStringList &directoryOptions, QTextStream &streamOut, QTextStream &streamIn)
     {
         Q_ASSERT(!directoryOptions.isEmpty());
-        if (directoryOptions.isEmpty())  { return ""; }
+        if (directoryOptions.isEmpty()) { return {}; }
         if (directoryOptions.size() < 2) { return directoryOptions.first(); }
 
         QString selectedDir;
diff --git a/src/blackmisc/simplecommandparser.cpp b/src/blackmisc/simplecommandparser.cpp
index 4da7eaddd..66a7b7dc2 100644
--- a/src/blackmisc/simplecommandparser.cpp
+++ b/src/blackmisc/simplecommandparser.cpp
@@ -62,7 +62,7 @@ namespace BlackMisc
         const QString p = this->part(index);
         const int from = index < 1 ? 0 : nthIndexOf(m_cleanedLine, ' ', index, Qt::CaseInsensitive);
         const int fi = m_cleanedLine.indexOf(p, from, Qt::CaseInsensitive);
-        if (fi < 0) { return ""; }
+        if (fi < 0) { return {}; }
         return m_originalLine.mid(fi).trimmed();
     }
 
@@ -154,7 +154,7 @@ namespace BlackMisc
 
     QString CSimpleCommandParser::commandsHtmlHelp()
     {
-        if (s_commands.isEmpty()) { return ""; }
+        if (s_commands.isEmpty()) { return {}; }
 
         static const QString html("<table style=\"font-size: 8pt; white-space: nowrap;\">\n%1\n</table>");
         static const QString row("<td>%1</td><td>%2</td>");
diff --git a/src/blackmisc/simulation/aircraftmodellist.cpp b/src/blackmisc/simulation/aircraftmodellist.cpp
index d30eeaa48..5f5170651 100644
--- a/src/blackmisc/simulation/aircraftmodellist.cpp
+++ b/src/blackmisc/simulation/aircraftmodellist.cpp
@@ -381,14 +381,14 @@ namespace BlackMisc
 
         QString CAircraftModelList::findModelIconPathByModelString(const QString &modelString) const
         {
-            if (modelString.isEmpty()) { return ""; }
+            if (modelString.isEmpty()) { return {}; }
             const CAircraftModel m(findFirstByModelStringOrDefault(modelString, Qt::CaseInsensitive));
             return m.getIconPath();
         }
 
         QString CAircraftModelList::findModelIconPathByCallsign(const CCallsign &callsign) const
         {
-            if (callsign.isEmpty()) { return ""; }
+            if (callsign.isEmpty()) { return {}; }
             const CAircraftModel m(findFirstByCallsignOrDefault(callsign));
             return m.getIconPath();
         }
@@ -1175,7 +1175,7 @@ namespace BlackMisc
 
         QString CAircraftModelList::asHtmlSummary() const
         {
-            if (this->isEmpty()) { return ""; }
+            if (this->isEmpty()) { return {}; }
             QString html;
             for (const CAircraftModel &model : *this)
             {
diff --git a/src/blackmisc/simulation/aircraftmodelutils.cpp b/src/blackmisc/simulation/aircraftmodelutils.cpp
index 3917e2134..7fd36621e 100644
--- a/src/blackmisc/simulation/aircraftmodelutils.cpp
+++ b/src/blackmisc/simulation/aircraftmodelutils.cpp
@@ -34,7 +34,7 @@ namespace BlackMisc
 
         QString CAircraftModelUtilities::createIcaoAirlineAircraftHtmlMatrix(const CAircraftModelList &models)
         {
-            if (models.isEmpty()) { return ""; }
+            if (models.isEmpty()) { return {}; }
             static const QString emptyDesignator = "----";
             static const QString colorLiveryDesignator = "-C-";
 
@@ -124,13 +124,13 @@ namespace BlackMisc
         QString CAircraftModelUtilities::createIcaoAirlineAircraftHtmlMatrixFile(const CAircraftModelList &models, const QString &tempDir)
         {
             Q_ASSERT_X(!tempDir.isEmpty(), Q_FUNC_INFO, "Need directory");
-            if (models.isEmpty()) { return ""; }
+            if (models.isEmpty()) { return {}; }
             const QString html = createIcaoAirlineAircraftHtmlMatrix(models);
-            if (html.isEmpty()) { return ""; }
+            if (html.isEmpty()) { return {}; }
 
             QDir dir(tempDir);
             BLACK_VERIFY_X(dir.exists(), Q_FUNC_INFO, "Directory does not exist");
-            if (!dir.exists()) { return ""; }
+            if (!dir.exists()) { return {}; }
 
             const QString htmlTemplate = CFileUtils::readFileToString(CDirectoryUtils::htmlTemplateFilePath());
             const QString fn("airlineAircraftMatrix.html");
diff --git a/src/blackmisc/simulation/distributor.cpp b/src/blackmisc/simulation/distributor.cpp
index 7349c5d26..c39efb598 100644
--- a/src/blackmisc/simulation/distributor.cpp
+++ b/src/blackmisc/simulation/distributor.cpp
@@ -38,10 +38,10 @@ namespace BlackMisc
         {
             if (!this->getDbKey().isEmpty() && !this->getDescription().isEmpty())
             {
-                return this->getDbKey() + " " + this->getDescription();
+                return this->getDbKey() % u' ' % this->getDescription();
             }
             if (!this->getDbKey().isEmpty()) { return this->getDbKey(); }
-            return "";
+            return {};
         }
 
         bool CDistributor::matchesKeyOrAlias(const QString &keyOrAlias) const
diff --git a/src/blackmisc/simulation/fscommon/aircraftcfgentries.cpp b/src/blackmisc/simulation/fscommon/aircraftcfgentries.cpp
index 5a9f7aacd..cfebcd541 100644
--- a/src/blackmisc/simulation/fscommon/aircraftcfgentries.cpp
+++ b/src/blackmisc/simulation/fscommon/aircraftcfgentries.cpp
@@ -48,7 +48,7 @@ namespace BlackMisc
 
             QString CAircraftCfgEntries::getFileDirectory() const
             {
-                if (m_fileName.isEmpty()) { return ""; }
+                if (m_fileName.isEmpty()) { return {}; }
                 const QFileInfo fileInfo(m_fileName);
                 return fileInfo.absolutePath();
             }
@@ -166,8 +166,8 @@ namespace BlackMisc
 
             QString CAircraftCfgEntries::getThumbnailFileNameGuess() const
             {
-                if (m_texture.isEmpty()) { return ""; }
-                if (m_fileName.isEmpty()) { return ""; }
+                if (m_texture.isEmpty()) { return {}; }
+                if (m_fileName.isEmpty()) { return {}; }
                 QString fn = QDir::cleanPath(this->getFileDirectory() + QDir::separator() + "texture." + m_texture + QDir::separator() + "thumbnail.jpg");
                 return fn;
             }
@@ -175,9 +175,9 @@ namespace BlackMisc
             QString CAircraftCfgEntries::getThumbnailFileNameChecked() const
             {
                 const QString f(getThumbnailFileNameGuess());
-                if (f.isEmpty()) { return ""; }
+                if (f.isEmpty()) { return {}; }
                 if (QFile(f).exists()) { return f; }
-                return "";
+                return {};
             }
 
             CVariant CAircraftCfgEntries::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
diff --git a/src/blackmisc/simulation/fscommon/aircraftcfgparser.cpp b/src/blackmisc/simulation/fscommon/aircraftcfgparser.cpp
index 180ce70df..fc3ff8a47 100644
--- a/src/blackmisc/simulation/fscommon/aircraftcfgparser.cpp
+++ b/src/blackmisc/simulation/fscommon/aircraftcfgparser.cpp
@@ -389,7 +389,7 @@ namespace BlackMisc
             {
                 if (qv.isNull() || !qv.isValid())
                 {
-                    return ""; // normal when there is no settings value
+                    return {}; // normal when there is no settings value
                 }
                 else if (static_cast<QMetaType::Type>(qv.type()) == QMetaType::QStringList)
                 {
@@ -401,15 +401,15 @@ namespace BlackMisc
                     return qv.toString().trimmed();
                 }
                 Q_ASSERT(false);
-                return "";
+                return {};
             }
 
             QString CAircraftCfgParser::getFixedIniLineContent(const QString &line)
             {
-                if (line.isEmpty()) { return ""; }
+                if (line.isEmpty()) { return {}; }
                 int index = line.indexOf('=');
-                if (index < 0) { return ""; }
-                if (line.length() < index  + 1) { return ""; }
+                if (index < 0) { return {}; }
+                if (line.length() < index + 1) { return {}; }
 
                 QString content(line.midRef(index + 1).trimmed().toString());
 
diff --git a/src/blackmisc/simulation/fscommon/fscommonutil.cpp b/src/blackmisc/simulation/fscommon/fscommonutil.cpp
index 7af36f214..e0eba1d77 100644
--- a/src/blackmisc/simulation/fscommon/fscommonutil.cpp
+++ b/src/blackmisc/simulation/fscommon/fscommonutil.cpp
@@ -93,7 +93,7 @@ namespace BlackMisc
             QString fsxSimObjectsDirFromRegistryImpl()
             {
                 const QString fsxPath = CFsCommonUtil::fsxDirFromRegistry();
-                if (fsxPath.isEmpty()) { return ""; }
+                if (fsxPath.isEmpty()) { return {}; }
                 return CFsCommonUtil::fsxSimObjectsDirFromSimDir(fsxPath);
             }
 
@@ -106,7 +106,7 @@ namespace BlackMisc
             QString fsxSimObjectsDirImpl()
             {
                 QString dir(CFsCommonUtil::fsxDir());
-                if (dir.isEmpty()) { return ""; }
+                if (dir.isEmpty()) { return {}; }
                 return CFsCommonUtil::fsxSimObjectsDirFromSimDir(dir);
             }
 
@@ -186,7 +186,7 @@ namespace BlackMisc
             QString p3dSimObjectsDirFromRegistryImpl()
             {
                 const QString p3dPath = CFsCommonUtil::p3dDirFromRegistry();
-                if (p3dPath.isEmpty()) { return ""; }
+                if (p3dPath.isEmpty()) { return {}; }
                 return CFsCommonUtil::fsxSimObjectsDirFromSimDir(p3dPath);
             }
 
@@ -199,7 +199,7 @@ namespace BlackMisc
             QString p3dSimObjectsDirImpl()
             {
                 QString dir(CFsCommonUtil::p3dDir());
-                if (dir.isEmpty()) { return ""; }
+                if (dir.isEmpty()) { return {}; }
                 return CFsCommonUtil::fsxSimObjectsDirFromSimDir(dir);
             }
 
diff --git a/src/blackmisc/simulation/fsx/simconnectutilities.cpp b/src/blackmisc/simulation/fsx/simconnectutilities.cpp
index 0c4b2b335..0510f6485 100644
--- a/src/blackmisc/simulation/fsx/simconnectutilities.cpp
+++ b/src/blackmisc/simulation/fsx/simconnectutilities.cpp
@@ -73,7 +73,7 @@ namespace BlackMisc
 
             QString CSimConnectUtilities::ipAddress(const QSettings *simConnectSettings)
             {
-                if (!simConnectSettings) { return QString(""); }
+                if (!simConnectSettings) { return {}; }
                 return simConnectSettings->value("SimConnect/Address").toString();
             }
 
@@ -167,8 +167,8 @@ namespace BlackMisc
             QString CSimConnectUtilities::getSimConnectIniFileDirectory(CSimulatorInfo &simulator)
             {
                 static const QString docDir = QStandardPaths::locate(QStandardPaths::DocumentsLocation, "", QStandardPaths::LocateDirectory);
-                if (docDir.isEmpty()) { return ""; }
-                if (!simulator.isSingleSimulator() || !simulator.isFsxP3DFamily()) return "";
+                if (docDir.isEmpty()) { return {}; }
+                if (!simulator.isSingleSimulator() || !simulator.isFsxP3DFamily()) return {};
 
                 const QString iniDir = CFileUtils::appendFilePaths(docDir, simulator.isP3D() ? "Prepar3D v4 Files" : "Flight Simulator X Files");
                 if (getSimConnectIniFileDirectories().isEmpty()) { return iniDir; }
diff --git a/src/blackmisc/simulation/modelconverterx.cpp b/src/blackmisc/simulation/modelconverterx.cpp
index a79d3fcd7..656fba813 100644
--- a/src/blackmisc/simulation/modelconverterx.cpp
+++ b/src/blackmisc/simulation/modelconverterx.cpp
@@ -67,9 +67,9 @@ namespace BlackMisc
         {
             static const BlackMisc::CSettingReadOnly<TModelConverterXBinary> setting(new QObject());
             const QString mcx = setting.get();
-            if (mcx.isEmpty()) return "";
+            if (mcx.isEmpty()) return {};
             const QFile f(mcx);
-            return (f.exists()) ? mcx : "";
+            return (f.exists()) ? mcx : QString();
         }
     } // ns
 } // ns
diff --git a/src/blackmisc/statusmessage.cpp b/src/blackmisc/statusmessage.cpp
index 8b2d43e08..9a1b10f89 100644
--- a/src/blackmisc/statusmessage.cpp
+++ b/src/blackmisc/statusmessage.cpp
@@ -198,7 +198,7 @@ namespace BlackMisc
 
     QString CStatusMessage::getHumanOrTechnicalCategoriesAsString() const
     {
-        if (m_categories.isEmpty()) { return ""; }
+        if (m_categories.isEmpty()) { return {}; }
         const QString c(getHumanReadablePattern());
         return c.isEmpty() ? this->getCategoriesAsString() : c;
     }
diff --git a/src/blackmisc/statusmessagelist.cpp b/src/blackmisc/statusmessagelist.cpp
index d580f2139..4dd62d8b9 100644
--- a/src/blackmisc/statusmessagelist.cpp
+++ b/src/blackmisc/statusmessagelist.cpp
@@ -221,7 +221,7 @@ namespace BlackMisc
 
     QString CStatusMessageList::toHtml(const CPropertyIndexList &indexes) const
     {
-        if (indexes.isEmpty() || this->isEmpty()) { return ""; }
+        if (indexes.isEmpty() || this->isEmpty()) { return {}; }
         QString html;
         int line = 1;
         const bool withLineNumbers = indexes.contains(CPropertyIndex::GlobalIndexLineNumber);
diff --git a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp
index 0b43b5c7d..b0cd37ef3 100644
--- a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp
+++ b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp
@@ -2444,7 +2444,7 @@ namespace BlackSimPlugin
             {
                 return this->getSendIdTraceDetails(trace);
             }
-            return "";
+            return {};
         }
 
         QString CSimulatorFsxCommon::getSendIdTraceDetails(const TraceFsxSendId &trace) const
diff --git a/src/swiftcore/swiftcore.cpp b/src/swiftcore/swiftcore.cpp
index f157a4048..357b8d1fc 100644
--- a/src/swiftcore/swiftcore.cpp
+++ b/src/swiftcore/swiftcore.cpp
@@ -174,8 +174,8 @@ void CSwiftCore::disconnectFromNetwork()
 
 QString CSwiftCore::getAudioCmdFromRadioButtons() const
 {
-    if (ui->rb_AudioOnCore->isChecked()) { return "--coreaudio"; }
-    return "";
+    if (ui->rb_AudioOnCore->isChecked()) { return QStringLiteral("--coreaudio"); }
+    return {};
 }
 
 QStringList CSwiftCore::getRestartCmdArgs() const