From 16042c1fb24cf705edd4a6ce5c0cb389f90219fc Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Fri, 6 Feb 2015 00:47:23 +0100 Subject: [PATCH] refs #369, gcc fixes --- src/blackcore/context_simulator_impl.cpp | 2 ++ src/blackcore/context_simulator_proxy.cpp | 2 +- src/blackgui/models/atcstationlistmodel.cpp | 4 ++++ src/blackmisc/avatcstation.h | 4 ++-- src/blackmisc/timestampbased.cpp | 5 +++++ 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/blackcore/context_simulator_impl.cpp b/src/blackcore/context_simulator_impl.cpp index 73db1866c..10264b491 100644 --- a/src/blackcore/context_simulator_impl.cpp +++ b/src/blackcore/context_simulator_impl.cpp @@ -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 diff --git a/src/blackcore/context_simulator_proxy.cpp b/src/blackcore/context_simulator_proxy.cpp index c5b4fe590..1fadce665 100644 --- a/src/blackcore/context_simulator_proxy.cpp +++ b/src/blackcore/context_simulator_proxy.cpp @@ -96,7 +96,7 @@ namespace BlackCore CAircraftModelList CContextSimulatorProxy::getInstalledModelsStartingWith(const QString modelString) const { - return m_dBusInterface->callDBusRet(QLatin1Literal("getInstalledModelsStartingWith")); + return m_dBusInterface->callDBusRet(QLatin1Literal("getInstalledModelsStartingWith"), modelString); } CAircraftIcao CContextSimulatorProxy::getIcaoForModelString(const QString &modelString) const diff --git a/src/blackgui/models/atcstationlistmodel.cpp b/src/blackgui/models/atcstationlistmodel.cpp index 5eb7fc00a..86a324ad7 100644 --- a/src/blackgui/models/atcstationlistmodel.cpp +++ b/src/blackgui/models/atcstationlistmodel.cpp @@ -127,6 +127,10 @@ namespace BlackGui new QStandardItem(station.getBookedUntilUtc().toString(CDateTimeFormatter::formatYmdhm())) }; break; + case NotSet: + default: + Q_ASSERT(false); + break; } typeFolderFirstColumn->appendRow(stationRow); } diff --git a/src/blackmisc/avatcstation.h b/src/blackmisc/avatcstation.h index 86ff78f58..6e8866fbb 100644 --- a/src/blackmisc/avatcstation.h +++ b/src/blackmisc/avatcstation.h @@ -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 diff --git a/src/blackmisc/timestampbased.cpp b/src/blackmisc/timestampbased.cpp index 10713d385..7885673d1 100644 --- a/src/blackmisc/timestampbased.cpp +++ b/src/blackmisc/timestampbased.cpp @@ -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());