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

refs #356 Update remaining CValueObject derived classes to use CValueObjectStdTuple instead.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2015-03-16 18:38:03 +00:00
parent 2a3e0acf23
commit a5e6b31c0f
7 changed files with 61 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/blackmisc/dictionary.h
View File

@@ -74,10 +74,26 @@ namespace BlackMisc
struct AssociativityTraits : public Private::AssociativityTraits<Private::ADL::SupportsQHash<Key>::value, Private::ADL::SupportsQMap<Key>::value>
{};
//! Associative container with value semantics, chooses a sensible default implementation container type
// forward declaration
template<class Key, class Value, template <class...> class Impl = AssociativityTraits<Key>::template DefaultType>
class CDictionary : public CValueObject
class CDictionary;
//! \private
template <class Key, class Value, template <class...> class Impl>
struct CValueObjectStdTuplePolicy<CDictionary<Key, Value, Impl>> : public CValueObjectLegacy
{};
//! Associative container with value semantics, chooses a sensible default implementation container type
template<class Key, class Value, template <class...> class Impl /*= AssociativityTraits<Key>::template DefaultType*/>
class CDictionary : public CValueObjectStdTuple<CDictionary<Key, Value, Impl>>
{
//! \copydoc BlackMisc::CValueObject::compare
friend int compare(const CDictionary &a, const CDictionary &b)
{
if (a.m_impl.size() < b.m_impl.size()) { return -1; }
if (a.m_impl.size() > b.m_impl.size()) { return 1; }
return 0;
}
public:
//! The implementation container
@@ -408,22 +424,6 @@ namespace BlackMisc
//! \copydoc BlackMisc::CValueObject::getMetaTypeId
virtual int getMetaTypeId() const override { return qMetaTypeId<CDictionary>(); }
//! \copydoc BlackMisc::CValueObject::isA
virtual bool isA(int metaTypeId) const override
{
if (metaTypeId == qMetaTypeId<CDictionary>()) { return true; }
return CValueObject::isA(metaTypeId);
}
//! \copydoc BlackMisc::CValueObject::compareImpl
virtual int compareImpl(const CValueObject &other) const override
{
const auto &o = static_cast<const CDictionary &>(other);
if (m_impl.size() < o.m_impl.size()) { return -1; }
if (m_impl.size() > o.m_impl.size()) { return 1; }
return 0;
}
//! \copydoc BlackMisc::CValueObject::marshallToDbus
virtual void marshallToDbus(QDBusArgument &argument) const override
{