diff --git a/src/blackgui/levelmeter.cpp b/src/blackgui/levelmeter.cpp index 85c2ed36a..d03112be2 100644 --- a/src/blackgui/levelmeter.cpp +++ b/src/blackgui/levelmeter.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2013 +/* Copyright (C) 2015 * swift project Community / Contributors * * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level @@ -10,9 +10,7 @@ */ #include "levelmeter.h" - #include - #include #include #include diff --git a/src/blackgui/levelmeter.h b/src/blackgui/levelmeter.h index 499cfc98a..b2eaef1d7 100644 --- a/src/blackgui/levelmeter.h +++ b/src/blackgui/levelmeter.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2013 +/* Copyright (C) 2015 * swift project Community / Contributors * * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level diff --git a/src/blackgui/models/simulatedaircraftlistmodel.cpp b/src/blackgui/models/simulatedaircraftlistmodel.cpp index 4d319e59a..f7e75701b 100644 --- a/src/blackgui/models/simulatedaircraftlistmodel.cpp +++ b/src/blackgui/models/simulatedaircraftlistmodel.cpp @@ -73,6 +73,8 @@ namespace BlackGui this->m_columns.addColumn(CColumn::standardValueObject("cs.", "callsign", { CSimulatedAircraft::IndexCallsign, CCallsign::IndexCallsignString })); this->m_columns.addColumn(CColumn::standardString("realname", "pilot's real name", { CSimulatedAircraft::IndexPilot, CUser::IndexRealName })); this->m_columns.addColumn(CColumn("distance", CSimulatedAircraft::IndexDistanceToOwnAircraft, new CAirspaceDistanceFormatter())); + this->m_columns.addColumn(CColumn("p.", "parts", CSimulatedAircraft::IndexPartsSynchronized, + new CBoolIconFormatter(CIcons::StandardIconTick16, CIcons::StandardIconCross16, "parts", "no parts"), true)); this->m_columns.addColumn(CColumn::standardString("icao", { CSimulatedAircraft::IndexIcao, CAircraftIcao::IndexAsString})); this->m_columns.addColumn(CColumn::standardString("model", { CSimulatedAircraft::IndexModel, CAircraftModel::IndexModelString})); this->m_columns.addColumn(CColumn::standardString("desc.", "description", { CSimulatedAircraft::IndexModel, CAircraftModel::IndexDescription})); diff --git a/src/plugins/simulator/fs9/simulator_fs9.h b/src/plugins/simulator/fs9/simulator_fs9.h index 98db7f79d..aca2b49ce 100644 --- a/src/plugins/simulator/fs9/simulator_fs9.h +++ b/src/plugins/simulator/fs9/simulator_fs9.h @@ -40,7 +40,7 @@ namespace BlackSimPlugin Q_INTERFACES(BlackCore::ISimulatorFactory) public: - //! \copydoc BlackCore::ISimulatorFactory::create() + //! \copydoc BlackCore::ISimulatorFactory::create(ownAircraftProvider, remoteAircraftProvider, parent) virtual BlackCore::ISimulator *create( BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider, BlackMisc::Simulation::IRemoteAircraftProvider *remoteAircraftProvider, diff --git a/src/plugins/simulator/xplane/simulator_xplane.h b/src/plugins/simulator/xplane/simulator_xplane.h index 60218e2ca..c3cf3009a 100644 --- a/src/plugins/simulator/xplane/simulator_xplane.h +++ b/src/plugins/simulator/xplane/simulator_xplane.h @@ -34,10 +34,10 @@ namespace BlackSimPlugin Q_OBJECT public: - //! Constructor, parameters as in \sa BlackCore::ISimulatorFactory::create + //! \copydoc BlackCore::ISimulatorFactory::create(ownAircraftProvider, remoteAircraftProvider, parent) CSimulatorXPlane( BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider, - BlackMisc::Simulation::IRemoteAircraftProvider *remoteAircraft, + BlackMisc::Simulation::IRemoteAircraftProvider *remoteAircraftProvider, QObject *parent = nullptr); //! \copydoc BlackCore::ISimulator::isConnected @@ -92,7 +92,7 @@ namespace BlackSimPlugin //! \copydoc BlackCore::ISimulator::getInstalledModels virtual BlackMisc::Simulation::CAircraftModelList getInstalledModels() const override; - //! \copydoc BlackCore::ISimulator::getAirportsInRange + //! \copydoc BlackCore::ISimulator::getAirportsInRange virtual BlackMisc::Aviation::CAirportList getAirportsInRange() const; //! \copydoc ISimulator::setTimeSynchronization @@ -158,7 +158,8 @@ namespace BlackSimPlugin void resetData() { m_xplaneData = { "", "", 0, 0, 0, 0, 0, 0, 0, false, 122800, 122800, 122800, 122800, 2000, 0, false, false, false, false, - false, false, 0, 0, {}, false}; + false, false, 0, 0, {}, false + }; } }; @@ -173,7 +174,7 @@ namespace BlackSimPlugin public: //! \copydoc BlackCore::ISimulatorFactory::create() virtual BlackCore::ISimulator *create( - BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider, + BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider, BlackMisc::Simulation::IRemoteAircraftProvider *renderedAircraftProvider, QObject *parent) override;