flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-15 01:05:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Removed Mixin::MetaTypeAndQList.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2015-05-31 17:22:24 +01:00
parent 47cac09e81
commit 62418931b0
6 changed files with 26 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/blackmisc/variant.h
View File

@@ -40,7 +40,7 @@ namespace BlackMisc
*
* \see BLACKMISC_DECLARE_USING_MIXIN_METATYPE
*/
template <class Derived, class... AdditionalTypes>
template <class Derived>
class MetaType
{
public:
@@ -48,8 +48,6 @@ namespace BlackMisc
static void registerMetadata()
{
Private::MetaTypeHelper<Derived>::maybeRegisterMetaType();
// Details: https://dev.vatsim-germany.org/issues/413#note-6
[](...){}((qRegisterMetaType<AdditionalTypes>(), qDBusRegisterMetaType<AdditionalTypes>(), 0)...);
}
//! Returns the Qt meta type ID of this object.
@@ -74,15 +72,6 @@ namespace BlackMisc
static bool baseIsA(const void *, int) { return false; }
};
/*!
* Variant of MetaType mixin which also registers QList<Derived> with the type system.
*
* \see BLACKMISC_DECLARE_USING_MIXIN_METATYPE_AND_QLIST
*/
template <class Derived>
class MetaTypeAndQList : public MetaType<Derived, QList<Derived>>
{};
/*!
* When a derived class and a base class both inherit from Mixin::MetaType,
* the derived class uses this macro to disambiguate the inherited members.
@@ -92,17 +81,6 @@ namespace BlackMisc
using ::BlackMisc::Mixin::MetaType<DERIVED>::getMetaTypeId; \
using ::BlackMisc::Mixin::MetaType<DERIVED>::isA;
/*!
* When a derived class and a base class both inherit from Mixin::MetaType,
* the derived class uses this macro to disambiguate the inherited members.
*/
# define BLACKMISC_DECLARE_USING_MIXIN_METATYPE_AND_QLIST(DERIVED) \
using ::BlackMisc::Mixin::MetaTypeAndQList<DERIVED>::registerMetadata; \
using ::BlackMisc::Mixin::MetaTypeAndQList<DERIVED>::getMetaTypeId; \
using ::BlackMisc::Mixin::MetaTypeAndQList<DERIVED>::isA; \
using ::BlackMisc::Mixin::MetaTypeAndQList<DERIVED>::toQVariant; \
using ::BlackMisc::Mixin::MetaTypeAndQList<DERIVED>::convertFromQVariant;
} // Mixin
/*!