From 9e5666e0e23d1a0a143496a630e151bf9cc3909e Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Mon, 28 Apr 2014 19:04:51 +0200 Subject: [PATCH] Formatting / comments / typos --- src/blackcore/context_simulator.h | 5 +- src/blackmisc/blackmiscfreefunctions.h | 68 +++++------------------ src/plugins/simulator/fsx/simulator_fsx.h | 2 +- 3 files changed, 17 insertions(+), 58 deletions(-) diff --git a/src/blackcore/context_simulator.h b/src/blackcore/context_simulator.h index 08460bf24..72dd28543 100644 --- a/src/blackcore/context_simulator.h +++ b/src/blackcore/context_simulator.h @@ -15,6 +15,7 @@ #include "blackmisc/avaircraft.h" #include "blacksim/simulatorinfo.h" #include "blacksim/simulatorinfolist.h" +#include "blackmisc/project.h" #include namespace BlackCore @@ -71,10 +72,10 @@ namespace BlackCore virtual BlackSim::CSimulatorInfo getSimulatorInfo() const = 0; //! Load specific simulator plugin - virtual bool loadSimulatorPlugin (const BlackSim::CSimulatorInfo &simulatorInfo) = 0; + virtual bool loadSimulatorPlugin(const BlackSim::CSimulatorInfo &simulatorInfo) = 0; //! Unload simulator plugin - virtual void unloadSimulatorPlugin () = 0; + virtual void unloadSimulatorPlugin() = 0; //! Simulator avialable? bool isSimulatorAvailable() const { return BlackMisc::CProject::isCompiledWithFlightSimulatorSupport() && !getSimulatorInfo().isUnspecified(); } diff --git a/src/blackmisc/blackmiscfreefunctions.h b/src/blackmisc/blackmiscfreefunctions.h index 45f568661..793ada92c 100644 --- a/src/blackmisc/blackmiscfreefunctions.h +++ b/src/blackmisc/blackmiscfreefunctions.h @@ -25,9 +25,6 @@ inline void initBlackMiscResources() { Q_INIT_RESOURCE(blackmisc); } */ namespace BlackMisc { - /*! - * Free functions in PQs - */ namespace PhysicalQuantities { /*! @@ -37,26 +34,16 @@ namespace BlackMisc } // PQ - /*! - * Free functions in aviation - */ namespace Aviation { - /*! - * \brief Register metadata for aviation - */ + //! Register metadata for aviation void registerMetadata(); } // Aviation - /*! - * Free functions in Math - */ namespace Math { - /*! - * \brief Register metadata for math (matrices, vectors) - */ + //! Register metadata for math (matrices, vectors) void registerMetadata(); } // Math @@ -64,48 +51,36 @@ namespace BlackMisc namespace Geo { - /*! - * \brief Register metadata for geo (coordinates) - */ + //! Register metadata for geo (coordinates) void registerMetadata(); } // Geo namespace Network { - /*! - * \brief Register metadata for network (server, user) - */ + //! Register metadata for network (server, user) void registerMetadata(); } namespace Settings { - /*! - * \brief Register metadata for settings - */ + //! Register metadata for settings void registerMetadata(); } namespace Audio { - /*! - * \brief Register metadata for audio / voice - */ + //! Register metadata for audio / voice void registerMetadata(); } namespace Hardware { - /*! - * \brief Register metadata for Hardware - */ + //! Register metadata for Hardware void registerMetadata(); } - /*! - * \brief Register all relevant metadata in BlackMisc - */ + //! Register all relevant metadata in BlackMisc void registerMetadata(); /*! @@ -122,22 +97,13 @@ namespace BlackMisc */ int firstBlackMetaType(); - /*! - * \brief Init resources - */ + //! Init resources void initResources(); - /*! - * \brief Compare 2 QVariants - */ + //! Compare 2 QVariants bool equalQVariants(const QVariant &v1, const QVariant &v2); - /*! - * \brief Compare QVariants - * \param v1 - * \param v2 - * \return same return values as in QString::compare() - */ + //! Compare QVariants int compareQVariants(const QVariant &v1, const QVariant &v2); /*! @@ -182,18 +148,10 @@ namespace BlackMisc */ uint calculateHash(const QList &values, const char *className); - /*! - * \brief Real heap size of an object - * \param type - * \return - */ + //! Real heap size of an object size_t heapSizeOf(const QMetaType &type); - /*! - * \brief Real heap size of an object - * \param objectType - * \return - */ + //! Real heap size of an object size_t heapSizeOf(const QMetaObject &objectType); } // BlackMisc diff --git a/src/plugins/simulator/fsx/simulator_fsx.h b/src/plugins/simulator/fsx/simulator_fsx.h index 699e66ce5..31cf71c47 100644 --- a/src/plugins/simulator/fsx/simulator_fsx.h +++ b/src/plugins/simulator/fsx/simulator_fsx.h @@ -172,4 +172,4 @@ namespace BlackSimPlugin } // namespace BlackCore -#endif // BLACKSIMPLUGIN_SIMULATOR_FSX_H +#endif // guard