diff --git a/src/blackmisc/setaudio.cpp b/src/blackmisc/setaudio.cpp index 0fbac5316..6ec4a88f4 100644 --- a/src/blackmisc/setaudio.cpp +++ b/src/blackmisc/setaudio.cpp @@ -158,7 +158,7 @@ namespace BlackMisc /* * Value */ - BlackMisc::CStatusMessageList CSettingsAudio::value(const QString &path, const QString &command, const QVariant &value, bool &changedFlag) + BlackMisc::CStatusMessageList CSettingsAudio::value(const QString &path, const QString &command, const CVariant &value, bool &changedFlag) { // TODO: This needs to be refactored to a smarter way to delegate commands changedFlag = false; diff --git a/src/blackmisc/setaudio.h b/src/blackmisc/setaudio.h index 045400dea..1e1916eb9 100644 --- a/src/blackmisc/setaudio.h +++ b/src/blackmisc/setaudio.h @@ -52,7 +52,7 @@ namespace BlackMisc bool operator !=(const CSettingsAudio &other) const; //! \copydoc BlackCore::IContextSettings - virtual BlackMisc::CStatusMessageList value(const QString &path, const QString &command, const QVariant &value, bool &changedFlag); + virtual BlackMisc::CStatusMessageList value(const QString &path, const QString &command, const BlackMisc::CVariant &value, bool &changedFlag); //! \copydoc CValueObject::getValueHash virtual uint getValueHash() const override; diff --git a/src/blackmisc/variant.h b/src/blackmisc/variant.h index a01b776b4..e1d548d23 100644 --- a/src/blackmisc/variant.h +++ b/src/blackmisc/variant.h @@ -11,6 +11,7 @@ #define BLACKMISC_VARIANT_H #include +#include class QDBusArgument; @@ -54,13 +55,13 @@ namespace BlackMisc CVariant &operator =(const CVariant &other) { m_v = other.m_v; return *this; } //! Move assignment operatior. - CVariant &operator =(CVariant &&other) { m_v = std::move(other.m_v); return *this; } + CVariant &operator =(CVariant && other) { m_v = std::move(other.m_v); return *this; } //! Change the internal QVariant CVariant &operator =(const QVariant &var) { m_v = var; return *this; } //! Change the internal QVariant - CVariant &operator =(QVariant &&var) { m_v = std::move(var); return *this; } + CVariant &operator =(QVariant && var) { m_v = std::move(var); return *this; } //! Swap this variant with another. void swap(CVariant &other) { m_v.swap(other.m_v); } @@ -104,6 +105,15 @@ namespace BlackMisc //! Convert this variant to a bool. bool toBool() const { return m_v.toBool(); } + //! Convert this variant to an integer. + int toInt() const { return m_v.toInt(); } + + //! Convert this variant to double. + double toDouble() const { return m_v.toDouble(); } + + //! Convert this variant to QDateTime. + QDateTime toDateTime() const { return m_v.toDateTime(); } + //! Set the variant to null. void clear() { m_v.clear(); }