prepare for pull_request

swift-project · Dec 2, 2024 · 97d9990 · 97d9990
1 parent 738d24a
commit 97d9990
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 24 deletions.
diff --git a/cmake/tools.cmake b/cmake/tools.cmake
@@ -29,7 +29,7 @@ macro(load_vatsim_key)
     set(SWIFT_VATSIM_ID "0")
     set(SWIFT_VATSIM_KEY "00000000000000000000000000000000")
 
-    if(SWIFT_VATSIM_SUPPORT)
+    if(VATSIM_KEY_JSON)
         file(READ ${PROJECT_SOURCE_DIR}/${VATSIM_KEY_JSON} KEY_FILE)
         string(JSON SWIFT_VATSIM_ID GET ${KEY_FILE} vatsim id)
         string(JSON SWIFT_VATSIM_KEY GET ${KEY_FILE} vatsim key)

diff --git a/src/misc/simulation/fscommon/fscommonutil.cpp b/src/misc/simulation/fscommon/fscommonutil.cpp
@@ -224,7 +224,6 @@ namespace swift::misc::simulation::fscommon
                                                                  std::atomic_bool &stopped, const QString &simulatorDir)
     {
         Q_UNUSED(simulatorDir)
-        // TODO TZ a static value is currently returned here
         const QStringList simObjectPaths = CFsDirectories::msfsSimObjectsDirPath();
         return CFsCommonUtil::validateSimObjectsPath(QSet<QString>(simObjectPaths.begin(), simObjectPaths.end()),
                                                      models, validModels, invalidModels, ignoreEmptyFileNames,

diff --git a/src/misc/simulation/fscommon/fsdirectories.cpp b/src/misc/simulation/fscommon/fsdirectories.cpp
@@ -130,7 +130,6 @@ namespace swift::misc::simulation::fscommon
                 QStringList split = line.split(" ");
                 if (split.size() != 2) { return {}; }
                 QString packagePath = split[1].remove("\"");
-                // const QDir dir(packagePath.replace("\\", "/"));
                 const QDir dir(packagePath);
                 if (dir.exists()) { return packagePath; }
             }
@@ -164,13 +163,11 @@ namespace swift::misc::simulation::fscommon
         return CFsDirectories::fsxSimObjectsDirFromSimDir(dir);
     }
 
-    // TODO TZ
     QString msfsSimObjectsDirImpl()
     {
         QString dir(CFsDirectories::msfsDir());
         if (dir.isEmpty()) { return {}; }
         return CFileUtils::normalizeFilePathToQtStandard(msfsPackagesDirImpl());
-        // return CFsDirectories::msfsSimObjectsDirFromSimDir(dir);
     }
 
     const QString &CFsDirectories::fsxSimObjectsDir()
@@ -191,17 +188,6 @@ namespace swift::misc::simulation::fscommon
         return CFileUtils::appendFilePaths(CFileUtils::normalizeFilePathToQtStandard(simDir), "SimObjects");
     }
 
-    // TODO TZ MSFS has no subdirectory
-    // // still to remove
-    // QString CFsDirectories::msfsSimObjectsDirFromSimDir(const QString &simDir)
-    // {
-    //     if (simDir.isEmpty()) { return {}; }
-    //     return CFileUtils::normalizeFilePathToQtStandard(msfsPackagesDirImpl());
-    //
-    //     // return CFileUtils::appendFilePaths(CFileUtils::normalizeFilePathToQtStandard(msfsPackagesDirImpl()),
-    //     //                                    "SimObjects");
-    // }
-
     const QStringList &CFsDirectories::fsxSimObjectsExcludeDirectoryPatterns()
     {
         static const QStringList exclude { "SimObjects/Animals", "SimObjects/Misc", "SimObjects/GroundVehicles",
@@ -331,12 +317,9 @@ namespace swift::misc::simulation::fscommon
         return allPaths;
     }
 
-    // TODO TZ this function needs to be adjusted
-    // QStringList CFsDirectories::msfsSimObjectsDirPlusAddOnXmlSimObjectsPaths(const QString &simObjectsDir)  //
-    // changed name
     QStringList CFsDirectories::msfsSimObjectsDirPath(const QString &simObjectsDir)
     {
-        // static const QStringList Path { "F:/MSFSPackages" };
+        Q_UNUSED(simObjectsDir);
         static const QStringList Path { CFsDirectories::msfsSimObjectsDir() };
         return Path;
     }

diff --git a/src/misc/simulation/fscommon/fsdirectories.h b/src/misc/simulation/fscommon/fsdirectories.h
@@ -44,10 +44,6 @@ namespace swift::misc::simulation::fscommon
         //! FSX aircraft dir, relative to simulator directory
         static QString fsxSimObjectsDirFromSimDir(const QString &simDir);
 
-        // TODO TZ still to remove
-        //! MSFS aircraft dir, relative to simulator directory
-        // static QString msfsSimObjectsDirFromSimDir(const QString &simDir);
-
         //! Exclude directories for simObjects
         static const QStringList &fsxSimObjectsExcludeDirectoryPatterns();