mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-07 02:35:33 +08:00
refs #413 Make all value class methods non-virtual.
toCVariant() and convertFromCVariant() are now deprecated, use CVariant::from() and CVariant::to() instead.
This commit is contained in:
@@ -227,10 +227,10 @@ namespace BlackMisc
|
||||
}
|
||||
|
||||
//! \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); }
|
||||
|
||||
//! \copydoc CValueObject::toJson
|
||||
QJsonObject toJson() const
|
||||
@@ -404,7 +404,7 @@ namespace BlackMisc
|
||||
|
||||
//! \copydoc BlackMisc::CValueObject::convertToQString
|
||||
//! \todo Fix brackets
|
||||
virtual QString convertToQString(bool i18n = false) const override
|
||||
QString convertToQString(bool i18n = false) const
|
||||
{
|
||||
QString str = "{";
|
||||
for (auto it = m_impl.cbegin(); it != m_impl.end(); ++it)
|
||||
|
||||
Reference in New Issue
Block a user