diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e42ed8fd4..d710b92c7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,7 @@ env: do_vatsim_key: ${{ github.event_name == 'push' }} do_symbols: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }} do_doxygen: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }} - qt_version: 6.8.0 + qt_version: 6.10.0 bitrock_version: qt-professional-24.7.0 bitrock_url: https://releases.installbuilder.com/installbuilder externals: swift-project/externals diff --git a/samples/miscsim/samplesfscommon.cpp b/samples/miscsim/samplesfscommon.cpp index eca7bd6b2..039f73620 100644 --- a/samples/miscsim/samplesfscommon.cpp +++ b/samples/miscsim/samplesfscommon.cpp @@ -69,13 +69,15 @@ namespace swift::sample QByteArray jsonArray(doc.toJson()); streamOut << "write JSON array with size " << jsonArray.size() << Qt::endl; QTemporaryFile tempFile; - tempFile.open(); + bool res = tempFile.open(); + SWIFT_VERIFY_X(res, Q_FUNC_INFO, "Failed to open file"); tempFile.write(jsonArray); tempFile.close(); streamOut << "written to " << tempFile.fileName() << " in " << time.restart() << "ms" << Qt::endl; // re-read - tempFile.open(); + res = tempFile.open(); + SWIFT_VERIFY_X(res, Q_FUNC_INFO, "Failed to open file"); jsonArray = tempFile.readAll(); doc = QJsonDocument::fromJson(jsonArray); entriesList.clear(); diff --git a/src/core/fsd/fsdclient.cpp b/src/core/fsd/fsdclient.cpp index 156f27e3a..bbe6bc906 100644 --- a/src/core/fsd/fsdclient.cpp +++ b/src/core/fsd/fsdclient.cpp @@ -2077,13 +2077,15 @@ namespace swift::core::fsd { const QString filePath = CFileUtils::appendFilePaths(setting.getFileDir(), "rawfsdmessages.log"); m_rawFsdMessageLogFile.setFileName(filePath); - m_rawFsdMessageLogFile.open(QIODevice::Text | QIODevice::WriteOnly); + const bool res = m_rawFsdMessageLogFile.open(QIODevice::Text | QIODevice::WriteOnly); + SWIFT_VERIFY_X(res, Q_FUNC_INFO, "Could not open log file"); } else if (setting.getFileWriteMode() == CRawFsdMessageSettings::Append) { const QString filePath = CFileUtils::appendFilePaths(setting.getFileDir(), "rawfsdmessages.log"); m_rawFsdMessageLogFile.setFileName(filePath); - m_rawFsdMessageLogFile.open(QIODevice::Text | QIODevice::WriteOnly | QIODevice::Append); + const bool res = m_rawFsdMessageLogFile.open(QIODevice::Text | QIODevice::WriteOnly | QIODevice::Append); + SWIFT_VERIFY_X(res, Q_FUNC_INFO, "Could not open log file"); } else if (setting.getFileWriteMode() == CRawFsdMessageSettings::Timestamped) { @@ -2093,7 +2095,8 @@ namespace swift::core::fsd filename += QLatin1String(".log"); const QString filePath = CFileUtils::appendFilePaths(setting.getFileDir(), filename); m_rawFsdMessageLogFile.setFileName(filePath); - m_rawFsdMessageLogFile.open(QIODevice::Text | QIODevice::WriteOnly); + const bool res = m_rawFsdMessageLogFile.open(QIODevice::Text | QIODevice::WriteOnly); + SWIFT_VERIFY_X(res, Q_FUNC_INFO, "Could not open log file"); } } diff --git a/src/misc/datacache.cpp b/src/misc/datacache.cpp index c992c1668..b317c9063 100644 --- a/src/misc/datacache.cpp +++ b/src/misc/datacache.cpp @@ -83,7 +83,11 @@ namespace swift::misc connect(m_serializer, &CDataCacheSerializer::valuesLoadedFromStore, this, &CDataCache::changeValuesFromRemote, Qt::DirectConnection); - if (!QFile::exists(revisionFileName())) { QFile(revisionFileName()).open(QFile::WriteOnly); } + if (!QFile::exists(revisionFileName())) + { + const bool res = QFile(revisionFileName()).open(QFile::WriteOnly); + SWIFT_VERIFY_X(res, Q_FUNC_INFO, "Could not open revision file"); + } m_serializer->loadFromStore({}, false, true); // load pinned values singleShot(0, this, [this] // only start the serializer if the main thread event loop runs diff --git a/src/misc/filelogger.cpp b/src/misc/filelogger.cpp index 82c507677..fd35e3839 100644 --- a/src/misc/filelogger.cpp +++ b/src/misc/filelogger.cpp @@ -14,6 +14,7 @@ #include "config/buildconfig.h" #include "misc/swiftdirectories.h" +#include "misc/verify.h" using namespace swift::config; @@ -42,7 +43,8 @@ namespace swift::misc QDir::root().mkpath(CSwiftDirectories::logDirectory()); removeOldLogFiles(); m_logFile.setFileName(getLogFilePath()); - m_logFile.open(QIODevice::WriteOnly | QIODevice::Append | QIODevice::Text); + const bool res = m_logFile.open(QIODevice::WriteOnly | QIODevice::Append | QIODevice::Text); + SWIFT_VERIFY_X(res, Q_FUNC_INFO, "Could not open log file"); m_stream.setDevice(&m_logFile); m_stream.setEncoding(QStringConverter::Utf8); writeHeaderToFile(); diff --git a/src/misc/simulation/xplane/aircraftmodelloaderxplane.cpp b/src/misc/simulation/xplane/aircraftmodelloaderxplane.cpp index 12953bfa2..5c1bd3616 100644 --- a/src/misc/simulation/xplane/aircraftmodelloaderxplane.cpp +++ b/src/misc/simulation/xplane/aircraftmodelloaderxplane.cpp @@ -253,7 +253,8 @@ namespace swift::misc::simulation::xplane const QString packageFilePath = it.fileInfo().absolutePath(); QFile file(packageFile); - file.open(QIODevice::ReadOnly); + const bool res = file.open(QIODevice::ReadOnly); + SWIFT_VERIFY_X(res, Q_FUNC_INFO, "Could not open package file"); QString content; QTextStream ts(&file); @@ -273,7 +274,8 @@ namespace swift::misc::simulation::xplane emit this->loadingProgress(this->getSimulator(), QStringLiteral("Parsing CSL '%1'").arg(packageFile), -1); QFile file(packageFile); - file.open(QIODevice::ReadOnly); + const bool res = file.open(QIODevice::ReadOnly); + SWIFT_VERIFY_X(res, Q_FUNC_INFO, "Could not open package file"); QString content; QTextStream ts(&file); diff --git a/tests/core/testconnectivity/testconnectivity.cpp b/tests/core/testconnectivity/testconnectivity.cpp index 5ddec3fef..a6d569625 100644 --- a/tests/core/testconnectivity/testconnectivity.cpp +++ b/tests/core/testconnectivity/testconnectivity.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include #include diff --git a/tests/misc/aviation/testaircraftsituation/testaircraftsituation.cpp b/tests/misc/aviation/testaircraftsituation/testaircraftsituation.cpp index b61924f53..fa809fd99 100644 --- a/tests/misc/aviation/testaircraftsituation/testaircraftsituation.cpp +++ b/tests/misc/aviation/testaircraftsituation/testaircraftsituation.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include "test.h" diff --git a/tests/misc/simulation/testinterpolatorlinear/testinterpolatorlinear.cpp b/tests/misc/simulation/testinterpolatorlinear/testinterpolatorlinear.cpp index a752bd3cb..c3d972067 100644 --- a/tests/misc/simulation/testinterpolatorlinear/testinterpolatorlinear.cpp +++ b/tests/misc/simulation/testinterpolatorlinear/testinterpolatorlinear.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include #include diff --git a/tests/misc/teststringutils/teststringutils.cpp b/tests/misc/teststringutils/teststringutils.cpp index d24af7118..73b0a5d7a 100644 --- a/tests/misc/teststringutils/teststringutils.cpp +++ b/tests/misc/teststringutils/teststringutils.cpp @@ -8,6 +8,7 @@ * \ingroup testmisc */ +#include #include #include