refs #345 Third and final wave of value classes using the CValueObjectStdTuple CRTP class template, with policy classes.

This commit is contained in:
Mathew Sutcliffe
2014-11-08 00:17:13 +00:00
parent 2b9d4098d4
commit f219d290f1
48 changed files with 326 additions and 1389 deletions

View File

@@ -26,24 +26,12 @@ namespace BlackMisc
* \details Used to parse strings into physical quantities, validate strings
* \sa BlackMisc::PhysicalQuantity
*/
class CPqString : public BlackMisc::CValueObject
class CPqString : public CValueObjectStdTuple<CPqString>
{
protected:
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override;
//! \copydoc CValueObject::marshallFromDbus()
virtual void marshallToDbus(QDBusArgument &argument) const override;
//! \copydoc CValueObject::unmarshallFromDbus()
virtual void unmarshallFromDbus(const QDBusArgument &argument) override;
//! \copydoc CValueObject::compareImpl
virtual int compareImpl(const CValueObject &other) const override;
//! \copydoc CValueObject::isA
virtual bool isA(int metaTypeId) const override;
public:
//! Number separators / group separators
enum SeparatorMode
@@ -66,27 +54,6 @@ namespace BlackMisc
//! Constructor, for values such as 10km/h
CPqString(const QString &value) : m_string(value) {}
//! \copydoc CValueObject::getMetaTypeId
int getMetaTypeId() const override;
//! \copydoc CValueObject::getValueHash
virtual uint getValueHash() const override;
//! Equal operator ==
bool operator ==(const CPqString &other) const;
//! Unequal operator !=
bool operator !=(const CPqString &other) const;
//! \copydoc CValueObject::toQVariant
virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); }
//! \copydoc CValueObject::convertFromQVariant
virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); }
//! Register metadata
static void registerMetadata();
//! Parse a string value like "100m", "10.3Mhz"
static QVariant parseToVariant(const QString &value, SeparatorMode mode = SeparatorsCLocale);