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

Changed audio settings to CVariant after merge with master

Browse Source
This commit is contained in:
Klaus Basan
2014-06-09 17:35:37 +02:00
parent c99b340833
commit 61740fab0a
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackmisc/setaudio.cpp
View File

@@ -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;

2
src/blackmisc/setaudio.h
View File

@@ -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;

14
src/blackmisc/variant.h
View File

@@ -11,6 +11,7 @@
#define BLACKMISC_VARIANT_H
#include <QVariant>
#include <QDateTime>
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(); }