mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-30 14:15:35 +08:00
@@ -44,7 +44,7 @@ namespace BlackMisc
|
|||||||
*/
|
*/
|
||||||
CVariant CAircraftModel::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
|
CVariant CAircraftModel::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
|
||||||
{
|
{
|
||||||
if (index.isMyself()) { return this->toQVariant(); }
|
if (index.isMyself()) { return this->toCVariant(); }
|
||||||
ColumnIndex i = index.frontCasted<ColumnIndex>();
|
ColumnIndex i = index.frontCasted<ColumnIndex>();
|
||||||
switch (i)
|
switch (i)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ namespace BlackSim
|
|||||||
QStringList titles = this->getTitles(true);
|
QStringList titles = this->getTitles(true);
|
||||||
QStringList ambiguousTitles;
|
QStringList ambiguousTitles;
|
||||||
QString last;
|
QString last;
|
||||||
foreach(QString title, titles)
|
for (const QString &title : titles)
|
||||||
{
|
{
|
||||||
if (title.isEmpty()) { continue; }
|
if (title.isEmpty()) { continue; }
|
||||||
if (title.compare(last, Qt::CaseInsensitive) == 0)
|
if (title.compare(last, Qt::CaseInsensitive) == 0)
|
||||||
@@ -116,7 +116,7 @@ namespace BlackSim
|
|||||||
// Dirs last is crucial,since I will break recursion on "aircraft.cfg" level
|
// Dirs last is crucial,since I will break recursion on "aircraft.cfg" level
|
||||||
QFileInfoList files = dir.entryInfoList(QDir::Files | QDir::AllDirs, QDir::DirsLast);
|
QFileInfoList files = dir.entryInfoList(QDir::Files | QDir::AllDirs, QDir::DirsLast);
|
||||||
|
|
||||||
foreach(QFileInfo file, files)
|
for (const QFileInfo &file : files)
|
||||||
{
|
{
|
||||||
if (m_cancelRead) { return -1; }
|
if (m_cancelRead) { return -1; }
|
||||||
if (file.isDir())
|
if (file.isDir())
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ namespace BlackSim
|
|||||||
if (!dir.exists()) return;
|
if (!dir.exists()) return;
|
||||||
QStringList nameFilters({"*.vmr"});
|
QStringList nameFilters({"*.vmr"});
|
||||||
QFileInfoList entries = dir.entryInfoList(nameFilters, QDir::Files | QDir::Readable);
|
QFileInfoList entries = dir.entryInfoList(nameFilters, QDir::Files | QDir::Readable);
|
||||||
foreach(QFileInfo file, entries)
|
for (const QFileInfo &file : entries)
|
||||||
{
|
{
|
||||||
this->addFilename(file.absoluteFilePath());
|
this->addFilename(file.absoluteFilePath());
|
||||||
}
|
}
|
||||||
@@ -63,7 +63,7 @@ namespace BlackSim
|
|||||||
bool success = true;
|
bool success = true;
|
||||||
this->m_loadedFiles = 0;
|
this->m_loadedFiles = 0;
|
||||||
this->m_fileListWithProblems.clear();
|
this->m_fileListWithProblems.clear();
|
||||||
foreach(QString fn, this->m_fileList)
|
for (const QString &fn : this->m_fileList)
|
||||||
{
|
{
|
||||||
this->m_loadedFiles++;
|
this->m_loadedFiles++;
|
||||||
bool s = this->loadFile(fn);
|
bool s = this->loadFile(fn);
|
||||||
@@ -108,8 +108,8 @@ namespace BlackSim
|
|||||||
if (modelName.contains("//"))
|
if (modelName.contains("//"))
|
||||||
{
|
{
|
||||||
// multiple models
|
// multiple models
|
||||||
QStringList models = modelName.split("//");
|
const QStringList models = modelName.split("//");
|
||||||
foreach(QString model, models)
|
for (const QString &model : models)
|
||||||
{
|
{
|
||||||
if (model.isEmpty()) { continue; }
|
if (model.isEmpty()) { continue; }
|
||||||
CAircraftMapping mapping("vpilot", folder, typeCode, airlineCode, model);
|
CAircraftMapping mapping("vpilot", folder, typeCode, airlineCode, model);
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ namespace BlackSim
|
|||||||
{
|
{
|
||||||
if (modelNames.isEmpty() || this->m_mappings.isEmpty()) { return this->m_mappings.size(); }
|
if (modelNames.isEmpty() || this->m_mappings.isEmpty()) { return this->m_mappings.size(); }
|
||||||
CAircraftMappingList newList;
|
CAircraftMappingList newList;
|
||||||
foreach(CAircraftMapping mapping, this->m_mappings)
|
for (const CAircraftMapping &mapping : this->m_mappings)
|
||||||
{
|
{
|
||||||
QString modelString = mapping.getModel().getModelString();
|
QString modelString = mapping.getModel().getModelString();
|
||||||
if (modelString.isEmpty()) { continue; }
|
if (modelString.isEmpty()) { continue; }
|
||||||
|
|||||||
@@ -584,7 +584,7 @@ namespace BlackSimPlugin
|
|||||||
|
|
||||||
void CSimulatorFsx::updateOtherAircraft()
|
void CSimulatorFsx::updateOtherAircraft()
|
||||||
{
|
{
|
||||||
foreach(CSimConnectObject simObj, m_simConnectObjects)
|
for (const CSimConnectObject &simObj : m_simConnectObjects)
|
||||||
{
|
{
|
||||||
if (simObj.getInterpolator()->hasEnoughAircraftSituations())
|
if (simObj.getInterpolator()->hasEnoughAircraftSituations())
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user