style changes and removals of typeid

refs #81

src/blackmisc/avheading.h

@@ -9,118 +9,108 @@
 
 namespace BlackMisc
 {
-namespace Aviation
-{
-
-/*!
- * \brief Heading as used in aviation, can be true or magnetic heading
- * \remarks Intentionally allowing +/- CAngle , and >= / <= CAngle.
- */
-class CHeading : public BlackMisc::PhysicalQuantities::CAngle
-{
-public:
-    /*!
-     * Enum type to distinguish between true north and magnetic north
-     */
-    enum ReferenceNorth
+    namespace Aviation
     {
-        Magnetic = 0,   //!< magnetic north
-        True = 1,       //!< true north
-    };
 
-private:
-    ReferenceNorth m_north; //!< magnetic or true?
+        /*!
+         * \brief Heading as used in aviation, can be true or magnetic heading
+         * \remarks Intentionally allowing +/- CAngle , and >= / <= CAngle.
+         */
+        class CHeading : public BlackMisc::PhysicalQuantities::CAngle
+        {
+        public:
+            /*!
+             * Enum type to distinguish between true north and magnetic north
+             */
+            enum ReferenceNorth
+            {
+                Magnetic = 0,   //!< magnetic north
+                True = 1        //!< true north
+            };
 
-protected:
-    /*!
-     * \brief Specific stream operation for heading
-     * \param i18n
-     * \return
-     */
-    virtual QString convertToQString(bool i18n = false) const;
+        private:
+            ReferenceNorth m_north; //!< magnetic or true?
 
-    /*!
-     * \brief Stream to DBus <<
-     * \param argument
-     */
-    virtual void marshallToDbus(QDBusArgument &argument) const
-    {
-        this->CAngle::marshallToDbus(argument);
-        argument << qint32(this->m_north);
-    }
+        protected:
+            /*!
+             * \brief Specific stream operation for heading
+             * \param i18n
+             * \return
+             */
+            virtual QString convertToQString(bool i18n = false) const;
 
-    /*!
-     * \brief Stream from DBus >>
-     * \param argument
-     */
-    virtual void unmarshallFromDbus(const QDBusArgument &argument)
-    {
-        this->CAngle::unmarshallFromDbus(argument);
-        qint32 north;
-        argument >> north;
-        this->m_north = static_cast<ReferenceNorth>(north);
-    }
+            /*!
+             * \brief Stream to DBus <<
+             * \param argument
+             */
+            virtual void marshallToDbus(QDBusArgument &argument) const;
 
-public:
-    /*!
-     * \brief Default constructor: 0 heading true
-     */
-    CHeading() : CAngle(0, BlackMisc::PhysicalQuantities::CAngleUnit::rad()), m_north(Magnetic) {}
+            /*!
+             * \brief Stream from DBus >>
+             * \param argument
+             */
+            virtual void unmarshallFromDbus(const QDBusArgument &argument);
 
-    /*!
-     * \brief Constructor
-     * \param value
-     * \param north
-     * \param unit
-     */
-    CHeading(double value, ReferenceNorth north, const BlackMisc::PhysicalQuantities::CAngleUnit &unit) : CAngle(value, unit), m_north(north) {}
+        public:
+            /*!
+             * \brief Default constructor: 0 heading true
+             */
+            CHeading() : CAngle(0, BlackMisc::PhysicalQuantities::CAngleUnit::rad()), m_north(Magnetic) {}
 
-    /*!
-     * \brief Constructor by CAngle
-     * \param north
-     * \param magnetic
-     */
-    CHeading(CAngle heading, ReferenceNorth north) : CAngle(heading), m_north(north) {}
+            /*!
+             * \brief Constructor
+             * \param value
+             * \param north
+             * \param unit
+             */
+            CHeading(double value, ReferenceNorth north, const BlackMisc::PhysicalQuantities::CAngleUnit &unit) : CAngle(value, unit), m_north(north) {}
 
-    /*!
-     * \brief Equal operator ==
-     * \param other
-     * @return
-     */
-    bool operator ==(const CHeading &other);
+            /*!
+             * \brief Constructor by CAngle
+             * \param north
+             * \param magnetic
+             */
+            CHeading(CAngle heading, ReferenceNorth north) : CAngle(heading), m_north(north) {}
 
-    /*!
-     * \brief Unequal operator ==
-     * \param other
-     * @return
-     */
-    bool operator !=(const CHeading &other);
+            /*!
+             * \brief Equal operator ==
+             * \param other
+             * @return
+             */
+            bool operator ==(const CHeading &other) const;
 
-    /*!
-     * \brief Magnetic heading?
-     * \return
-     */
-    bool isMagneticHeading() const { return Magnetic == this->m_north; }
+            /*!
+             * \brief Unequal operator ==
+             * \param other
+             * @return
+             */
+            bool operator !=(const CHeading &other) const;
 
-    /*!
-     * \brief True heading?
-     * \return
-     */
-    bool isTrueHeading() const { return True == this->m_north; }
+            /*!
+             * \brief Magnetic heading?
+             * \return
+             */
+            bool isMagneticHeading() const { return Magnetic == this->m_north; }
 
-    /*!
-     * \brief Get reference north (magnetic or true)
-     * \return
-     */
-    ReferenceNorth getReferenceNorth() const { return m_north; }
+            /*!
+             * \brief True heading?
+             * \return
+             */
+            bool isTrueHeading() const { return True == this->m_north; }
 
-    /*!
-     * \brief Register metadata
-     */
-    static void registerMetadata();
-};
+            /*!
+             * \brief Get reference north (magnetic or true)
+             * \return
+             */
+            ReferenceNorth getReferenceNorth() const { return m_north; }
 
-} // namespace
+            /*!
+             * \brief Register metadata
+             */
+            static void registerMetadata();
+        };
+
+    } // namespace
 } // namespace
 
 Q_DECLARE_METATYPE(BlackMisc::Aviation::CHeading)