Merge branch 'master' of dev.vatsim-germany.org:vatpilotclient/client

2026-04-20 04:25:42 +08:00 · 2014-01-17 18:20:56 +01:00
parent 4d6564af64 b20523a8f7
commit c384e3d12e
59 changed files with 1161 additions and 255 deletions
--- a/src/blackmisc/vvoiceroom.h
+++ b/src/blackmisc/vvoiceroom.h
@@ -166,6 +166,21 @@ namespace BlackMisc
             */
            virtual QString convertToQString(bool i18n = false) const;

+            /*!
+             * \copydoc CValueObject::getMetaTypeId
+             */
+            virtual int getMetaTypeId() const;
+
+            /*!
+             * \copydoc CValueObject::isA
+             */
+            virtual bool isA(int metaTypeId) const;
+
+            /*!
+             * \copydoc CValueObject::compareImpl
+             */
+            virtual int compareImpl(const CValueObject &other) const;
+
            /*!
             * \brief Stream to DBus <<
             * \param argument