flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-04 16:56:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #237, fixed typo and naming (driver->plugin)

Browse Source
This commit is contained in:
Klaus Basan
2014-06-28 17:54:11 +02:00
parent 8ad0d4bb68
commit ef0877b116
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackcore/context_simulator_impl.cpp
View File

@@ -159,7 +159,7 @@ namespace BlackCore
else if (plugin.size() > 1)
{
return this->loadSimulatorPlugin(
this->getIContextSettings()->getSimulatorSettings().getSelectedDriver()
this->getIContextSettings()->getSimulatorSettings().getSelectedPlugin()
);
}
else
@@ -262,7 +262,7 @@ namespace BlackCore
IContextSettings::SettingsType settingsType = static_cast<IContextSettings::SettingsType>(type);
if (settingsType == IContextSettings::SettingsSimulator)
{
CSimulatorInfo driver = this->getIContextSettings()->getSimulatorSettings().getSelectedDriver();
CSimulatorInfo driver = this->getIContextSettings()->getSimulatorSettings().getSelectedPlugin();
if (this->loadSimulatorPlugin(driver))
{
QString m = QString("Driver loaded: '%1'").arg(driver.toQString(true));

8
src/blacksim/setsimulator.cpp
View File

@@ -22,7 +22,7 @@ namespace BlackSim
{
Q_UNUSED(i18n);
QString s("Sel.driver:");
s.append(" ").append(m_selectedDriver.toQString(i18n));
s.append(" ").append(m_selectedPlugin.toQString(i18n));
return s;
}
@@ -122,7 +122,7 @@ namespace BlackSim
*/
void CSettingsSimulator::initDefaultValues()
{
this->m_selectedDriver = CSimulatorInfo::FSX();
this->m_selectedPlugin = CSimulatorInfo::FSX();
}
/*
@@ -149,9 +149,9 @@ namespace BlackSim
if (command == CSettingUtilities::CmdUpdate())
{
CSimulatorInfo v = value.value<CSimulatorInfo>();
changedFlag = (v != this->m_selectedDriver);
changedFlag = (v != this->m_selectedPlugin);
msgs.push_back(CSettingUtilities::valueChangedMessage(changedFlag, "selected driver"));
this->m_selectedDriver = v;
this->m_selectedPlugin = v;
return msgs;
}
return msgs;

8
src/blacksim/setsimulator.h
View File

@@ -38,10 +38,10 @@ namespace BlackSim
virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); }
//! Selected driver
BlackSim::CSimulatorInfo getSelectedDriver() const { return this->m_selectedDriver; }
BlackSim::CSimulatorInfo getSelectedPlugin() const { return this->m_selectedPlugin; }
//! Selected driver
bool setSelectedDriver(const BlackSim::CSimulatorInfo &driver) { this->m_selectedDriver = driver; }
void setSelectedPlugin(const BlackSim::CSimulatorInfo &plugin) { this->m_selectedPlugin = plugin; }
//! Equal operator ==
bool operator ==(const CSettingsSimulator &other) const;
@@ -91,13 +91,13 @@ namespace BlackSim
private:
BLACK_ENABLE_TUPLE_CONVERSION(CSettingsSimulator)
BlackSim::CSimulatorInfo m_selectedDriver;
BlackSim::CSimulatorInfo m_selectedPlugin;
};
} // namespace
} // namespace
Q_DECLARE_METATYPE(BlackSim::Settings::CSettingsSimulator)
BLACK_DECLARE_TUPLE_CONVERSION(BlackSim::Settings::CSettingsSimulator, (o.m_selectedDriver))
BLACK_DECLARE_TUPLE_CONVERSION(BlackSim::Settings::CSettingsSimulator, (o.m_selectedPlugin))
#endif // guard