From 76bc6f0efc827d9c742944997b631dd1e00bb8fe Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sun, 6 Jul 2014 17:07:48 +0200 Subject: [PATCH] Formatting, tweaks --- src/blackcore/context_simulator.h | 2 +- src/blackcore/simulator.h | 6 +----- src/blackgui/aircraftlistmodel.h | 11 +++-------- src/blackgui/aircraftview.h | 2 +- src/blackgui/airportlistmodel.h | 4 ++-- src/blackgui/listmodelbase.cpp | 2 ++ src/blackgui/timerbasedcomponent.cpp | 2 ++ .../simulator/xplane/simulator_xplane.cpp | 16 ++++++++-------- 8 files changed, 20 insertions(+), 25 deletions(-) diff --git a/src/blackcore/context_simulator.h b/src/blackcore/context_simulator.h index 83b0d64f1..552a1ff56 100644 --- a/src/blackcore/context_simulator.h +++ b/src/blackcore/context_simulator.h @@ -108,6 +108,6 @@ namespace BlackCore IContextSimulator(CRuntimeConfig::ContextMode mode, CRuntime *runtime) : CContext(mode, runtime) {} }; -} // namespace BlackCore +} // namespace #endif // guard diff --git a/src/blackcore/simulator.h b/src/blackcore/simulator.h index 556cb3c4e..c314863fb 100644 --- a/src/blackcore/simulator.h +++ b/src/blackcore/simulator.h @@ -111,11 +111,7 @@ namespace BlackCore //! ISimulatorVirtual destructor virtual ~ISimulatorFactory() {} - /*! - * ISimulatorCreate a new instance - * \param parent - * \return - */ + //! Create a new instance virtual ISimulator *create(QObject *parent = nullptr) = 0; //! Simulator info diff --git a/src/blackgui/aircraftlistmodel.h b/src/blackgui/aircraftlistmodel.h index c1c27d029..b3aff9f5a 100644 --- a/src/blackgui/aircraftlistmodel.h +++ b/src/blackgui/aircraftlistmodel.h @@ -14,22 +14,17 @@ namespace BlackGui { /*! - * \brief Aircraft list model + * Aircraft list model */ class CAircraftListModel : public CListModelBase { public: - /*! - * \brief Constructor - * \param parent - */ + //! Constructor explicit CAircraftListModel(QObject *parent = nullptr); - /*! - * \brief Destructor - */ + //! Destructor virtual ~CAircraftListModel() {} }; diff --git a/src/blackgui/aircraftview.h b/src/blackgui/aircraftview.h index 1e8b96f2f..70b6ccc63 100644 --- a/src/blackgui/aircraftview.h +++ b/src/blackgui/aircraftview.h @@ -7,7 +7,7 @@ namespace BlackGui { /*! - * \brief Aircrafts view + * Aircrafts view */ class CAircraftView : public CViewBase { diff --git a/src/blackgui/airportlistmodel.h b/src/blackgui/airportlistmodel.h index b8aa0f2bb..4d296a895 100644 --- a/src/blackgui/airportlistmodel.h +++ b/src/blackgui/airportlistmodel.h @@ -15,10 +15,10 @@ namespace BlackGui public: - //! \brief Constructor + //! Constructor explicit CAirportListModel(QObject *parent = nullptr); - //! \brief Destructor + //! Destructor virtual ~CAirportListModel() {} }; } diff --git a/src/blackgui/listmodelbase.cpp b/src/blackgui/listmodelbase.cpp index 15ab7c0c6..2606ab060 100644 --- a/src/blackgui/listmodelbase.cpp +++ b/src/blackgui/listmodelbase.cpp @@ -7,6 +7,7 @@ #include "blackmisc/statusmessagelist.h" #include "blackmisc/avatcstationlist.h" #include "blackmisc/avaircraftlist.h" +#include "blackmisc/avairportlist.h" #include "blackmisc/nwserverlist.h" #include "blackmisc/nwuserlist.h" #include "blackmisc/nwclientlist.h" @@ -228,6 +229,7 @@ namespace BlackGui template class CListModelBase; template class CListModelBase; template class CListModelBase; + template class CListModelBase; template class CListModelBase; template class CListModelBase; template class CListModelBase; diff --git a/src/blackgui/timerbasedcomponent.cpp b/src/blackgui/timerbasedcomponent.cpp index 38bb3052d..dd004b593 100644 --- a/src/blackgui/timerbasedcomponent.cpp +++ b/src/blackgui/timerbasedcomponent.cpp @@ -19,7 +19,9 @@ namespace BlackGui void CTimerBasedComponent::setUpdateInterval(int milliSeconds) { if (milliSeconds < 100) + { this->m_timer->stop(); + } else { this->m_timer->setInterval(milliSeconds); diff --git a/src/plugins/simulator/xplane/simulator_xplane.cpp b/src/plugins/simulator/xplane/simulator_xplane.cpp index 1995e5284..5e0934580 100644 --- a/src/plugins/simulator/xplane/simulator_xplane.cpp +++ b/src/plugins/simulator/xplane/simulator_xplane.cpp @@ -239,7 +239,7 @@ namespace BlackSimPlugin } void CSimulatorXPlane::addRemoteAircraft(const BlackMisc::Aviation::CCallsign &callsign, const QString &type, - const BlackMisc::Aviation::CAircraftSituation &initialSituation) + const BlackMisc::Aviation::CAircraftSituation &initialSituation) { Q_UNUSED(initialSituation); // fixed gcc warning if (! isConnected()) { return; } @@ -249,18 +249,18 @@ namespace BlackSimPlugin } void CSimulatorXPlane::addAircraftSituation(const BlackMisc::Aviation::CCallsign &callsign, - const BlackMisc::Aviation::CAircraftSituation &situ) + const BlackMisc::Aviation::CAircraftSituation &situ) { if (! isConnected()) { return; } if (! m_planes.contains(callsign.asString())) { addRemoteAircraft(callsign, "A320", situ); } // FIXME should not be needed here IMHO using namespace BlackMisc::PhysicalQuantities; m_traffic->setPlanePosition(callsign.asString(), - situ.latitude().value(CAngleUnit::deg()), - situ.longitude().value(CAngleUnit::deg()), - situ.getAltitude().value(CLengthUnit::ft()), - situ.getPitch().value(CAngleUnit::deg()), - situ.getBank().value(CAngleUnit::deg()), - situ.getHeading().value(CAngleUnit::deg())); + situ.latitude().value(CAngleUnit::deg()), + situ.longitude().value(CAngleUnit::deg()), + situ.getAltitude().value(CLengthUnit::ft()), + situ.getPitch().value(CAngleUnit::deg()), + situ.getBank().value(CAngleUnit::deg()), + situ.getHeading().value(CAngleUnit::deg())); m_traffic->setPlaneSurfaces(callsign.asString(), true, 0, 0, 0, 0, 0, 0, 0, 0, 0, true, true, true, true, 0); // TODO landing gear, lights, control surfaces m_traffic->setPlaneTransponder(callsign.asString(), 2000, true, false); // TODO transponder }