mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-15 01:05:35 +08:00
Use nested namespaces (C++17 feature)
This commit is contained in:
Mat Sutcliffe
@@ -16,102 +16,96 @@
|
||||
#include "blackmisc/blackmiscexport.h"
|
||||
#include <QStringList>
|
||||
|
||||
namespace BlackMisc
|
||||
namespace BlackMisc::Simulation::XPlane
|
||||
{
|
||||
namespace Simulation
|
||||
//! XPlane utils
|
||||
class BLACKMISC_EXPORT CXPlaneUtil
|
||||
{
|
||||
namespace XPlane
|
||||
{
|
||||
//! XPlane utils
|
||||
class BLACKMISC_EXPORT CXPlaneUtil
|
||||
{
|
||||
public:
|
||||
//! Constructor
|
||||
CXPlaneUtil() = delete;
|
||||
public:
|
||||
//! Constructor
|
||||
CXPlaneUtil() = delete;
|
||||
|
||||
//! Log categories
|
||||
static const QStringList &getLogCategories();
|
||||
//! Log categories
|
||||
static const QStringList &getLogCategories();
|
||||
|
||||
//! XPlane 9 directory
|
||||
static QString xplane9Dir();
|
||||
//! XPlane 9 directory
|
||||
static QString xplane9Dir();
|
||||
|
||||
//! XPlane 10 directory
|
||||
static QString xplane10Dir();
|
||||
//! XPlane 10 directory
|
||||
static QString xplane10Dir();
|
||||
|
||||
//! XPlane 11 directory
|
||||
static QString xplane11Dir();
|
||||
//! XPlane 11 directory
|
||||
static QString xplane11Dir();
|
||||
|
||||
//! XPlane root directory
|
||||
//! In case more then one XPlane version is found, the path to the highest version is used
|
||||
static const QString &xplaneRootDir();
|
||||
//! XPlane root directory
|
||||
//! In case more then one XPlane version is found, the path to the highest version is used
|
||||
static const QString &xplaneRootDir();
|
||||
|
||||
//! Is the xplaneRootDir existing?
|
||||
static bool isXplaneRootDirExisting();
|
||||
//! Is the xplaneRootDir existing?
|
||||
static bool isXplaneRootDirExisting();
|
||||
|
||||
//! XPlane plugin directory
|
||||
//! In case more then one XPlane version is found, the path to the highest version is used
|
||||
static const QString &xplanePluginDir();
|
||||
//! XPlane plugin directory
|
||||
//! In case more then one XPlane version is found, the path to the highest version is used
|
||||
static const QString &xplanePluginDir();
|
||||
|
||||
//! Plugin directory from given simulator directory
|
||||
static QString pluginDirFromRootDir(const QString &rootDir = CXPlaneUtil::xplaneRootDir());
|
||||
//! Plugin directory from given simulator directory
|
||||
static QString pluginDirFromRootDir(const QString &rootDir = CXPlaneUtil::xplaneRootDir());
|
||||
|
||||
//! Model directories from simultaor directory
|
||||
static QStringList modelDirectoriesFromSimDir(const QString &simulatorDir);
|
||||
//! Model directories from simultaor directory
|
||||
static QStringList modelDirectoriesFromSimDir(const QString &simulatorDir);
|
||||
|
||||
//! Is the xplanePluginDir existing?
|
||||
static bool isXplanePluginDirDirExisting();
|
||||
//! Is the xplanePluginDir existing?
|
||||
static bool isXplanePluginDirDirExisting();
|
||||
|
||||
//! All sub directories of the plugin directory
|
||||
//! \remark uses CXPlaneUtil::xplanePluginPath as default
|
||||
static QStringList pluginSubdirectories(const QString &pluginDir = {});
|
||||
//! All sub directories of the plugin directory
|
||||
//! \remark uses CXPlaneUtil::xplanePluginPath as default
|
||||
static QStringList pluginSubdirectories(const QString &pluginDir = {});
|
||||
|
||||
//! Directories with models
|
||||
static const QStringList &xplaneModelDirectories();
|
||||
//! Directories with models
|
||||
static const QStringList &xplaneModelDirectories();
|
||||
|
||||
//! Exclude directories for models
|
||||
static const QStringList &xplaneModelExcludeDirectoryPatterns();
|
||||
//! Exclude directories for models
|
||||
static const QStringList &xplaneModelExcludeDirectoryPatterns();
|
||||
|
||||
//! XSwiftBus plugin directory
|
||||
static QString xswiftbusPluginDir(const QString &xplaneRootDir = CXPlaneUtil::xplaneRootDir());
|
||||
//! XSwiftBus plugin directory
|
||||
static QString xswiftbusPluginDir(const QString &xplaneRootDir = CXPlaneUtil::xplaneRootDir());
|
||||
|
||||
//! XSwiftBus legacy directory
|
||||
static QString xswiftbusLegacyDir(const QString &xplaneRootDir = CXPlaneUtil::xplaneRootDir());
|
||||
//! XSwiftBus legacy directory
|
||||
static QString xswiftbusLegacyDir(const QString &xplaneRootDir = CXPlaneUtil::xplaneRootDir());
|
||||
|
||||
//! Both directories, plugin and
|
||||
static bool hasXSwiftBusBuildAndPluginDir(const QString &xplaneRootDir);
|
||||
//! Both directories, plugin and
|
||||
static bool hasXSwiftBusBuildAndPluginDir(const QString &xplaneRootDir);
|
||||
|
||||
//! Finds conflicting plugins
|
||||
//! \remark uses CXPlaneUtil::xplanePluginPath as default
|
||||
static QStringList findConflictingPlugins(const QString &pluginDir = {});
|
||||
//! Finds conflicting plugins
|
||||
//! \remark uses CXPlaneUtil::xplanePluginPath as default
|
||||
static QStringList findConflictingPlugins(const QString &pluginDir = {});
|
||||
|
||||
//! \remark uses CXPlaneUtil::xplanePluginPath as default
|
||||
static QStringList findAllXplFiles(const QString &pluginDir = {});
|
||||
//! \remark uses CXPlaneUtil::xplanePluginPath as default
|
||||
static QStringList findAllXplFiles(const QString &pluginDir = {});
|
||||
|
||||
//! Newer XSwiftBus build
|
||||
static bool hasNewerXSwiftBusBuild(const QString &xplaneRootDir = CXPlaneUtil::xplaneRootDir());
|
||||
//! Newer XSwiftBus build
|
||||
static bool hasNewerXSwiftBusBuild(const QString &xplaneRootDir = CXPlaneUtil::xplaneRootDir());
|
||||
|
||||
//! Copy a XSwiftBus build
|
||||
//! \remark only copying in a local build environment
|
||||
static int copyXSwiftBusBuildFiles(const QString &xplaneRootDir = CXPlaneUtil::xplaneRootDir());
|
||||
//! Copy a XSwiftBus build
|
||||
//! \remark only copying in a local build environment
|
||||
static int copyXSwiftBusBuildFiles(const QString &xplaneRootDir = CXPlaneUtil::xplaneRootDir());
|
||||
|
||||
//! XPlane relative plugin path
|
||||
static const QString &xplanePluginPathName();
|
||||
//! XPlane relative plugin path
|
||||
static const QString &xplanePluginPathName();
|
||||
|
||||
//! XSwiftBus path name
|
||||
static const QString &xswiftbusPathName();
|
||||
//! XSwiftBus path name
|
||||
static const QString &xswiftbusPathName();
|
||||
|
||||
//! Filter filter for xpl files
|
||||
static const QStringList &xplFileFilter();
|
||||
//! Filter filter for xpl files
|
||||
static const QStringList &xplFileFilter();
|
||||
|
||||
//! Validate the model directories
|
||||
static CStatusMessageList validateModelDirectories(const QString &simDir, const QStringList &modelDirectories);
|
||||
//! Validate the model directories
|
||||
static CStatusMessageList validateModelDirectories(const QString &simDir, const QStringList &modelDirectories);
|
||||
|
||||
private:
|
||||
//! Concatenates dirs for used OS
|
||||
static QString xplaneDir(const QString &xplaneInstallFile);
|
||||
};
|
||||
} // namespace
|
||||
} // namespace
|
||||
private:
|
||||
//! Concatenates dirs for used OS
|
||||
static QString xplaneDir(const QString &xplaneInstallFile);
|
||||
};
|
||||
} // namespace
|
||||
|
||||
#endif // guard
|
||||
|
||||
Reference in New Issue
Block a user