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

refs #369, gcc fixes

Browse Source
This commit is contained in:
Klaus Basan
2015-02-06 00:47:23 +01:00
parent f6e5b8b3b1
commit 16042c1fb2
5 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackcore/context_simulator_impl.cpp
View File

@@ -241,6 +241,7 @@ namespace BlackCore
Q_ASSERT(c);
c = connect(networkContext, &IContextNetwork::changedAircraftEnabled, this->m_simulator, &ISimulator::changeAircraftEnabled);
Q_ASSERT(c);
Q_UNUSED(c);
for (const CSimulatedAircraft &simAircraft : networkContext->getAircraftInRange())
{
@@ -296,6 +297,7 @@ namespace BlackCore
IContextNetwork *networkContext = this->getIContextNetwork();
Q_ASSERT(networkContext);
Q_ASSERT(networkContext->isLocalObject());
Q_UNUSED(networkContext);
this->m_simulator->disconnect(); // disconnect all simulator signals
QObject::disconnect(this, nullptr, this->m_simulator, nullptr); // disconnect receiver simulator
this->m_simulator->disconnectFrom(); // disconnect from simulator

2
src/blackcore/context_simulator_proxy.cpp
View File

@@ -96,7 +96,7 @@ namespace BlackCore
CAircraftModelList CContextSimulatorProxy::getInstalledModelsStartingWith(const QString modelString) const
{
return m_dBusInterface->callDBusRet<BlackMisc::Simulation::CAircraftModelList>(QLatin1Literal("getInstalledModelsStartingWith"));
return m_dBusInterface->callDBusRet<BlackMisc::Simulation::CAircraftModelList>(QLatin1Literal("getInstalledModelsStartingWith"), modelString);
}
CAircraftIcao CContextSimulatorProxy::getIcaoForModelString(const QString &modelString) const

4
src/blackgui/models/atcstationlistmodel.cpp
View File

@@ -127,6 +127,10 @@ namespace BlackGui
new QStandardItem(station.getBookedUntilUtc().toString(CDateTimeFormatter::formatYmdhm()))
};
break;
case NotSet:
default:
Q_ASSERT(false);
break;
}
typeFolderFirstColumn->appendRow(stationRow);
}

4
src/blackmisc/avatcstation.h
View File

@@ -260,8 +260,8 @@ namespace BlackMisc
bool m_isOnline = false;
QDateTime m_bookedFromUtc;
QDateTime m_bookedUntilUtc;
CInformationMessage m_atis = { CInformationMessage::ATIS };
CInformationMessage m_metar = { CInformationMessage::METAR };
CInformationMessage m_atis { CInformationMessage::ATIS };
CInformationMessage m_metar { CInformationMessage::METAR };
BlackMisc::Audio::CVoiceRoom m_voiceRoom;
};
} // namespace

5
src/blackmisc/timestampbased.cpp
View File

@@ -88,6 +88,8 @@ namespace BlackMisc
return CVariant::fromValue(this->getMSecsSinceEpoch());
case IndexUtcTimestampFormatted:
return CVariant::fromValue(this->getFormattedUtcTimestamp());
default:
break;
}
}
const QString m = QString("Cannot handle index %1").arg(index.toQString());
@@ -108,6 +110,9 @@ namespace BlackMisc
case IndexMSecsSinceEpoch:
this->setMSecsSinceEpoch(variant.toInt());
return;
case IndexUtcTimestampFormatted:
default:
break;
}
}
const QString m = QString("Cannot handle index %1").arg(index.toQString());