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

refs #413 Make all value class methods non-virtual.

Browse Source 
toCVariant() and convertFromCVariant() are now deprecated,
use CVariant::from() and CVariant::to() instead.
This commit is contained in:
Mathew Sutcliffe
2015-05-05 17:08:30 +01:00
parent fe08792bef
commit 6b40cde862
90 changed files with 234 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackmisc/audio/audiodeviceinfo.h
View File

@@ -81,7 +81,7 @@ namespace BlackMisc
}
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override;
QString convertToQString(bool i18n = false) const;
private:
BLACK_ENABLE_TUPLE_CONVERSION(CAudioDeviceInfo)

4
src/blackmisc/audio/audiodeviceinfolist.h
View File

@@ -44,10 +44,10 @@ namespace BlackMisc
int count(CAudioDeviceInfo::DeviceType type) const;
//! \copydoc CValueObject::toQVariant
virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); }
QVariant toQVariant() const { return QVariant::fromValue(*this); }
//! \copydoc CValueObject::convertFromQVariant
virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); }
void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); }
//! Register metadata
static void registerMetadata();

6
src/blackmisc/audio/voiceroom.h
View File

@@ -86,10 +86,10 @@ namespace BlackMisc
bool isAtis() const;
//! \copydoc CValueObject::propertyByIndex
virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override;
CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
//! \copydoc CValueObject::setPropertyByIndex
virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override;
void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
//! Protocol prefix "vvl"
static const QString &protocol() { static QString p("vvl"); return p; }
@@ -101,7 +101,7 @@ namespace BlackMisc
static const QString &protocolComplete() { static QString p("vvl://"); return p; }
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override;
QString convertToQString(bool i18n = false) const;
private:
BLACK_ENABLE_TUPLE_CONVERSION(CVoiceRoom)

4
src/blackmisc/audio/voiceroomlist.h
View File

@@ -37,10 +37,10 @@ namespace BlackMisc
CVoiceRoomList(const CSequence &other);
//! \copydoc CValueObject::toQVariant
virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); }
QVariant toQVariant() const { return QVariant::fromValue(*this); }
//! \copydoc CValueObject::convertFromQVariant
virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); }
void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); }
//! \brief Register metadata
static void registerMetadata();