refs #808, CSimulatorInternals

* renamed from CSimulatorSetup to CSimulatorInternals
* removed the FSX class, no longer needed
* utility functions for CNameVariantPair
This commit is contained in:
Klaus Basan
2016-11-17 04:39:19 +01:00
parent e9f52bb829
commit 2163fd9b01
21 changed files with 100 additions and 156 deletions

View File

@@ -1,53 +0,0 @@
/* Copyright (C) 2013
* swift Project Community / Contributors
*
* This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
* directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
* including this file, may be copied, modified, propagated, or distributed except according to the terms
* contained in the LICENSE file.
*/
#include "blackconfig/buildconfig.h"
#include "blackmisc/simulation/fscommon/fscommonutil.h"
#include "blackmisc/simulation/fsx/fsxsimulatorsetup.h"
#include "blackmisc/simulation/fsx/simconnectutilities.h"
#include "simulation/simulatorsetup.h"
#include <QString>
using namespace BlackConfig;
using namespace BlackMisc;
using namespace BlackMisc::Simulation::FsCommon;
using namespace BlackMisc::Simulation;
namespace BlackMisc
{
namespace Simulation
{
namespace Fsx
{
CSimulatorSetup CFsxSimulatorSetup::getInitialSetup()
{
CSimulatorSetup s;
s.setValue(KeyLocalSimConnectCfgFilename(), CSimConnectUtilities::getLocalSimConnectCfgFilename());
if (CBuildConfig::isCompiledWithFsxSupport())
{
// set FSX path
QString fsxPath = CFsCommonUtil::fsxDirFromRegistry();
if (!fsxPath.isEmpty())
{
s.setSimulatorInstallationDirectory(fsxPath);
}
}
return s;
}
const QString &CFsxSimulatorSetup::KeyLocalSimConnectCfgFilename()
{
static const QString k("fsx/simConnectCfgFilename"); return k;
}
} // namespace
} // namespace
} // namespace

View File

@@ -1,45 +0,0 @@
/* Copyright (C) 2013
* swift Project Community / Contributors
*
* This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
* directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
* including this file, may be copied, modified, propagated, or distributed except according to the terms
* contained in the LICENSE file.
*/
//! \file
#ifndef BLACKMISC_SIMULATION_FSX_SIMSETUP_H
#define BLACKMISC_SIMULATION_FSX_SIMSETUP_H
#include "blackmisc/simulation/simulatorsetup.h"
#include "blackmisc/blackmiscexport.h"
class QString;
namespace BlackMisc
{
namespace Simulation
{
namespace Fsx
{
//! Simulator settings for FSX Flight simulators
class BLACKMISC_EXPORT CFsxSimulatorSetup
{
public:
//! No constructor
CFsxSimulatorSetup() = delete;
//! Init, to be used where FSX runs
static BlackMisc::Simulation::CSimulatorSetup getInitialSetup();
//! Key
static const QString &KeyLocalSimConnectCfgFilename();
};
} // namespace
} // namespace
} // namespace
#endif // guard