From 6bcded92642916c1b41f7d432ec470ca937a424f Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Wed, 27 Jun 2018 18:19:32 +0200 Subject: [PATCH] Style --- src/blackcore/data/vatsimsetup.h | 8 +-- src/blackgui/views/viewbase.h | 2 +- src/blackmisc/input/actionhotkeylist.h | 2 +- src/blackmisc/network/data/lastserver.h | 4 +- src/blackmisc/sequence.h | 2 +- .../simulation/settings/simulatorsettings.h | 10 +-- src/blackmisc/valuecache.cpp | 2 +- .../fsxcommon/simconnectdatadefinition.h | 62 +++++++++---------- 8 files changed, 46 insertions(+), 46 deletions(-) diff --git a/src/blackcore/data/vatsimsetup.h b/src/blackcore/data/vatsimsetup.h index 5ee6f88d6..5b36fb3af 100644 --- a/src/blackcore/data/vatsimsetup.h +++ b/src/blackcore/data/vatsimsetup.h @@ -121,20 +121,20 @@ namespace BlackCore //! Trait for global setup data struct TVatsimSetup : public BlackMisc::TDataTrait { - //! Key in data cache + //! \copydoc BlackCore::TDataTrait::key static const char *key() { return "vatsimsetup"; } - //! First load is synchronous + //! \copydoc BlackCore::TDataTrait::isPinned static constexpr bool isPinned() { return true; } }; //! Trait for last (most recently) used VATSIM server and user struct TVatsimLastServer : public BlackMisc::TDataTrait { - //! Key in data cache + //! \copydoc BlackCore::TDataTrait::isPinned static const char *key() { return "vatsimserver"; } - //! First load is synchronous + //! \copydoc BlackCore::TDataTrait::isPinned static constexpr bool isPinned() { return true; } }; } // ns diff --git a/src/blackgui/views/viewbase.h b/src/blackgui/views/viewbase.h index cb818e8af..be971f36e 100644 --- a/src/blackgui/views/viewbase.h +++ b/src/blackgui/views/viewbase.h @@ -318,7 +318,7 @@ namespace BlackGui //! Object has been double clicked void objectDoubleClicked(const BlackMisc::CVariant &object); - //! Object has been double clicked + //! Object has been selected void objectSelected(const BlackMisc::CVariant &object); //! Objects deleted from model diff --git a/src/blackmisc/input/actionhotkeylist.h b/src/blackmisc/input/actionhotkeylist.h index 9b6d49b1d..6ca68108c 100644 --- a/src/blackmisc/input/actionhotkeylist.h +++ b/src/blackmisc/input/actionhotkeylist.h @@ -30,7 +30,7 @@ namespace BlackMisc //! Value object encapsulating a list of hotkeys class BLACKMISC_EXPORT CActionHotkeyList : public CSequence, - public BlackMisc::Mixin::MetaType + public Mixin::MetaType { public: BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CActionHotkeyList) diff --git a/src/blackmisc/network/data/lastserver.h b/src/blackmisc/network/data/lastserver.h index 101f46112..c37f5ed9e 100644 --- a/src/blackmisc/network/data/lastserver.h +++ b/src/blackmisc/network/data/lastserver.h @@ -24,10 +24,10 @@ namespace BlackMisc //! Trait for last (most recently) used server and user struct TLastServer : public TDataTrait { - //! Key in data cache + //! \copydoc BlackCore::TDataTrait::key static const char *key() { return "lastserver"; } - //! First load is synchronous + //! \copydoc BlackCore::TDataTrait::isPinned static constexpr bool isPinned() { return true; } }; } // ns diff --git a/src/blackmisc/sequence.h b/src/blackmisc/sequence.h index 4338ad632..8e094b15a 100644 --- a/src/blackmisc/sequence.h +++ b/src/blackmisc/sequence.h @@ -555,4 +555,4 @@ Q_DECLARE_METATYPE(BlackMisc::CSequence) Q_DECLARE_METATYPE(BlackMisc::CSequence) Q_DECLARE_METATYPE(BlackMisc::CSequence) -#endif //BLACKMISC_SEQUENCE_H +#endif // guard diff --git a/src/blackmisc/simulation/settings/simulatorsettings.h b/src/blackmisc/simulation/settings/simulatorsettings.h index 34240359d..09068e0ac 100644 --- a/src/blackmisc/simulation/settings/simulatorsettings.h +++ b/src/blackmisc/simulation/settings/simulatorsettings.h @@ -85,7 +85,7 @@ namespace BlackMisc //! \copydoc BlackMisc::Mixin::String::toQString QString convertToQString(bool i18n = false) const; - //! To string + //! \copydoc BlackMisc::Mixin::String::toQString QString convertToQString(const QString &separator, bool i18n = false) const; //! \copydoc BlackMisc::Mixin::Index::propertyByIndex @@ -196,7 +196,7 @@ namespace BlackMisc static const char *key() { return "settingssimulatorfsx"; } //! \copydoc BlackCore::TSettingTrait::humanReadable - static const QString &humanReadable() { static const QString name("FSX"); return name; } + static const QString &humanReadable() { static const QString name("FSX settings"); return name; } }; //! Trait for simulator settings @@ -206,7 +206,7 @@ namespace BlackMisc static const char *key() { return "settingssimulatorfs9"; } //! \copydoc BlackCore::TSettingTrait::humanReadable - static const QString &humanReadable() { static const QString name("FS9"); return name; } + static const QString &humanReadable() { static const QString name("FS9 settings"); return name; } }; //! Trait for simulator settings @@ -216,7 +216,7 @@ namespace BlackMisc static const char *key() { return "settingssimulatorp3d"; } //! \copydoc BlackCore::TSettingTrait::humanReadable - static const QString &humanReadable() { static const QString name("P3D"); return name; } + static const QString &humanReadable() { static const QString name("P3D settings"); return name; } }; //! Trait for simulator settings @@ -226,7 +226,7 @@ namespace BlackMisc static const char *key() { return "settingssimulatorxplane"; } //! \copydoc BlackCore::TSettingTrait::humanReadable - static const QString &humanReadable() { static const QString name("XPlane"); return name; } + static const QString &humanReadable() { static const QString name("XPlane settings"); return name; } }; //! Bundle of settings for all simulators diff --git a/src/blackmisc/valuecache.cpp b/src/blackmisc/valuecache.cpp index abbd905a7..1c9c34737 100644 --- a/src/blackmisc/valuecache.cpp +++ b/src/blackmisc/valuecache.cpp @@ -732,7 +732,7 @@ namespace BlackMisc emit valuesWantToCache({ { { element.m_key, value } }, timestamp, save }); } // All good info - status = CStatusMessage(this).info("Set value %1") << element.m_nameWithKey; + status = CStatusMessage(this).info("Set value '%1'") << element.m_nameWithKey; } return status; } diff --git a/src/plugins/simulator/fsxcommon/simconnectdatadefinition.h b/src/plugins/simulator/fsxcommon/simconnectdatadefinition.h index 3f42a2c49..be5c2550b 100644 --- a/src/plugins/simulator/fsxcommon/simconnectdatadefinition.h +++ b/src/plugins/simulator/fsxcommon/simconnectdatadefinition.h @@ -29,41 +29,41 @@ namespace BlackSimPlugin //! \sa SimConnect events http://msdn.microsoft.com/en-us/library/cc526980.aspx struct DataDefinitionOwnAircraft { - double latitude; //!< Latitude (deg) - double longitude; //!< Longitude (deg) - double altitude; //!< Altitude (ft) - double altitudeAGL; //!< Altitude above ground (ft) - double pressureAltitude; //!< Pressure altitude (m) - double cgToGround; //!< Static CG to ground (ft) - double trueHeading; //!< True heading (deg) - double pitch; //!< Pitch (deg) - double bank; //!< Bank (deg) - double velocity; //!< Ground velocity - double elevation; //!< Elevation (ft) - double simOnGround; //!< Is aircraft on ground? + double latitude; //!< Latitude (deg) + double longitude; //!< Longitude (deg) + double altitude; //!< Altitude (ft) + double altitudeAGL; //!< Altitude above ground (ft) + double pressureAltitude; //!< Pressure altitude (m) + double cgToGround; //!< Static CG to ground (ft) + double trueHeading; //!< True heading (deg) + double pitch; //!< Pitch (deg) + double bank; //!< Bank (deg) + double velocity; //!< Ground velocity + double elevation; //!< Elevation (ft) + double simOnGround; //!< Is aircraft on ground? - double lightStrobe; //!< Is strobe light on? - double lightLanding; //!< Is landing light on? - double lightTaxi; //!< Is taxi light on? - double lightBeacon; //!< Is beacon light on? - double lightNav; //!< Is nav light on? - double lightLogo; //!< Is logo light on? + double lightStrobe; //!< Is strobe light on? + double lightLanding; //!< Is landing light on? + double lightTaxi; //!< Is taxi light on? + double lightBeacon; //!< Is beacon light on? + double lightNav; //!< Is nav light on? + double lightLogo; //!< Is logo light on? - double transponderCode; //!< Transponder Code - double com1ActiveMHz; //!< COM1 active frequency - double com2ActiveMHz; //!< COM2 active frequency - double com1StandbyMHz; //!< COM1 standby frequency - double com2StandbyMHz; //!< COM1 standby frequency + double transponderCode; //!< Transponder Code + double com1ActiveMHz; //!< COM1 active frequency + double com2ActiveMHz; //!< COM2 active frequency + double com1StandbyMHz; //!< COM1 standby frequency + double com2StandbyMHz; //!< COM1 standby frequency - double flapsHandlePosition; //!< Flaps handle position in percent - double spoilersHandlePosition; //!< Spoilers out? - double gearHandlePosition; //!< Gear handle position + double flapsHandlePosition; //!< Flaps handle position in percent + double spoilersHandlePosition; //!< Spoilers out? + double gearHandlePosition; //!< Gear handle position - double numberOfEngines; //!< Number of engines - double engine1Combustion; //!< Engine 1 combustion flag - double engine2Combustion; //!< Engine 2 combustion flag - double engine3Combustion; //!< Engine 3 combustion flag - double engine4Combustion; //!< Engine 4 combustion flag + double numberOfEngines; //!< Number of engines + double engine1Combustion; //!< Engine 1 combustion flag + double engine2Combustion; //!< Engine 2 combustion flag + double engine3Combustion; //!< Engine 3 combustion flag + double engine4Combustion; //!< Engine 4 combustion flag }; //! Data struct of aircraft position