refs #310, adjusted components / GUI to use renamed methods

This commit is contained in:
Klaus Basan
2014-10-08 19:09:54 +02:00
parent 9e23b0a2c0
commit 663740d5bd
6 changed files with 14 additions and 13 deletions

View File

@@ -152,7 +152,7 @@ namespace BlackGui
{
Q_ASSERT(this->getIContextOwnAircraft());
// direct object from local context
if (this->getIContextOwnAircraft()->usingLocalObjects()) return this->getRuntime()->getCContextOwnAircraft()->ownAircraft();
if (this->getIContextOwnAircraft()->isUsingImplementingObject()) return this->getRuntime()->getCContextOwnAircraft()->ownAircraft();
// non local
if (this->canPingApplicationContext()) return this->getIContextOwnAircraft()->getOwnAircraft();

View File

@@ -90,7 +90,7 @@ namespace BlackGui
if (this->getIContextApplication())
{
if (this->getIContextApplication()->usingLocalObjects())
if (this->getIContextApplication()->isUsingImplementingObject())
{
this->ui->led_DBus->setOn(false);
}

View File

@@ -111,13 +111,13 @@ namespace BlackGui
QString fileName = this->getIContextSimulator()->getSimulatorInfo().getSimulatorSetupValueAsString(CFsxSimulatorSetup::SetupSimConnectCfgFile);
Q_ASSERT(!fileName.isEmpty());
// write either local or remote file
bool local = this->getIContextSimulator()->usingLocalObjects();
bool success = local ?
bool localSimulatorObject = this->getIContextSimulator()->isUsingImplementingObject();
bool success = localSimulatorObject ?
BlackSim::Fsx::CSimConnectUtilities::writeSimConnectCfg(fileName, address, p) :
this->getIContextApplication()->writeToFile(fileName, CSimConnectUtilities::simConnectCfg(address, p));
if (success)
{
CLogMessage().info(this, local ? "Written local %1" : "Written remote %1") << fileName;
CLogMessage().info(this, localSimulatorObject ? "Written local %1" : "Written remote %1") << fileName;
}
else
{
@@ -149,7 +149,7 @@ namespace BlackGui
if (!this->getIContextSimulator()) return;
QString fileName = BlackSim::Fsx::CSimConnectUtilities::getLocalSimConnectCfgFilename();
QString m = QString("Deleted %1 ").append(fileName);
if (this->getIContextSimulator()->usingLocalObjects())
if (this->getIContextSimulator()->isUsingImplementingObject())
{
QFile f(fileName);
f.remove();
@@ -166,7 +166,7 @@ namespace BlackGui
{
if (!this->getIContextSimulator()) return;
QString fileName = BlackSim::Fsx::CSimConnectUtilities::getLocalSimConnectCfgFilename();
bool exists = this->getIContextSimulator()->usingLocalObjects() ?
bool exists = this->getIContextSimulator()->isUsingImplementingObject() ?
QFile::exists(fileName) :
this->getIContextApplication()->existsFile(fileName);
if (exists)