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

refs #437 Removed toQVariant and convertFromQVariant.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2015-05-31 17:21:17 +01:00
parent db5181c26a
commit 47cac09e81
10 changed files with 12 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
samples/blackmiscdbus/testservice_interface.h
View File

@@ -168,49 +168,49 @@ namespace BlackMiscTest
inline QDBusPendingReply<BlackMisc::Aviation::CAircraftList> pingAircraftList(BlackMisc::Aviation::CAircraftList aircraftList)
{
QList<QVariant> argumentList;
argumentList << aircraftList.toQVariant();
argumentList << QVariant::fromValue(aircraftList);
return asyncCallWithArgumentList(QLatin1String("pingAircraftList"), argumentList);
}
inline QDBusPendingReply<BlackMisc::Aviation::CAirportList> pingAirportList(BlackMisc::Aviation::CAirportList airportList)
{
QList<QVariant> argumentList;
argumentList << airportList.toQVariant();
argumentList << QVariant::fromValue(airportList);
return asyncCallWithArgumentList(QLatin1String("pingAirportList"), argumentList);
}
inline QDBusPendingReply<BlackMisc::Network::CClientList> pingClientList(BlackMisc::Network::CClientList clientList)
{
QList<QVariant> argumentList;
argumentList << clientList.toQVariant();
argumentList << QVariant::fromValue(clientList);
return asyncCallWithArgumentList(QLatin1String("pingClientList"), argumentList);
}
inline QDBusPendingReply<BlackMisc::Network::CClient> pingClient(BlackMisc::Network::CClient client)
{
QList<QVariant> argumentList;
argumentList << client.toQVariant();
argumentList << QVariant::fromValue(client);
return asyncCallWithArgumentList(QLatin1String("pingClient"), argumentList);
}
inline QDBusPendingReply<BlackMisc::CVariant> pingCVariant(BlackMisc::Network::CClient client)
{
QList<QVariant> argumentList;
argumentList << client.toQVariant();
argumentList << QVariant::fromValue(client);
return asyncCallWithArgumentList(QLatin1String("pingCVariant"), argumentList);
}
inline QDBusPendingReply<BlackMisc::CPropertyIndex> pingPropertyIndex(BlackMisc::CPropertyIndex index)
{
QList<QVariant> argumentList;
argumentList << index.toQVariant();
argumentList << QVariant::fromValue(index);
return asyncCallWithArgumentList(QLatin1String("pingPropertyIndex"), argumentList);
}
inline QDBusPendingReply<BlackMisc::CPropertyIndexVariantMap> pingIndexVariantMap(BlackMisc::CPropertyIndexVariantMap indexVariantMap)
{
QList<QVariant> argumentList;
argumentList << indexVariantMap.toQVariant();
argumentList << QVariant::fromValue(indexVariantMap);
return asyncCallWithArgumentList(QLatin1String("pingIndexVariantMap"), argumentList);
}

4
src/blackgui/components/settingssimulatorcomponent.cpp
View File

@@ -46,10 +46,10 @@ namespace BlackGui
Q_ASSERT_X(this->getIContextSettings(), Q_FUNC_INFO, "missing settings");
// set values
ui->cb_Plugins->addItem(tr("Auto"), CSimulatorPluginInfo().toQVariant());
ui->cb_Plugins->addItem(tr("Auto"), QVariant::fromValue(CSimulatorPluginInfo()));
for (const auto &p : getIContextSimulator()->getAvailableSimulatorPlugins())
{
ui->cb_Plugins->addItem(p.toQString(), p.toQVariant());
ui->cb_Plugins->addItem(p.toQString(), QVariant::fromValue(p));
}
// connects

2
src/blackgui/models/keyboardkeylistmodel.cpp
View File

@@ -120,7 +120,7 @@ namespace BlackGui
// otherwise (comboboxes) standard handling via QItemDelegate
CKeyboardLineEdit *lineEdit = qobject_cast<CKeyboardLineEdit *>(editor);
if (lineEdit)
model->setData(index, lineEdit->getKey().toQVariant() , Qt::EditRole);
model->setData(index, QVariant::fromValue(lineEdit->getKey()) , Qt::EditRole);
else
QItemDelegate::setModelData(editor, model, index);
}

2
src/blackgui/models/listmodelbase.cpp
View File

@@ -150,7 +150,7 @@ namespace BlackGui
//! Formatted data
ObjectType obj = this->getContainerOrFilteredContainer()[index.row()];
BlackMisc::CPropertyIndex propertyIndex = this->columnToPropertyIndex(index.column());
return formatter->data(role, obj.propertyByIndex(propertyIndex)).toQVariant();
return formatter->data(role, obj.propertyByIndex(propertyIndex)).getQVariant();
}
template <typename ObjectType, typename ContainerType>

6
src/blackmisc/aviation/callsignset.h
View File

@@ -32,12 +32,6 @@ namespace BlackMisc
//! Construct from a base class object.
CCallsignSet(const CCollection<CCallsign> &other);
//! \copydoc CValueObject::toQVariant
QVariant toQVariant() const { return QVariant::fromValue(*this); }
//! \copydoc CValueObject::convertFromQVariant
void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); }
//! Register metadata
static void registerMetadata();

6
src/blackmisc/dictionary.h
View File

@@ -220,12 +220,6 @@ namespace BlackMisc
removeByValueIf(BlackMisc::Predicates::MemberEqual(membFunc, returnValue));
}
//! \copydoc CValueObject::toQVariant()
QVariant toQVariant() const { return QVariant::fromValue(*this); }
//! \copydoc CValueObject::convertFromQVariant
void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); }
//! \copydoc CValueObject::toJson
QJsonObject toJson() const
{

3
src/blackmisc/iconlist.h
View File

@@ -36,9 +36,6 @@ namespace BlackMisc
//! Find by index
CIcon findByIndex(CIcons::IconIndex index) const;
//! \copydoc CValueObject::asQVariant
QVariant toQVariant() const { return QVariant::fromValue(*this); }
//! Register metadata of unit and quantity
static void registerMetadata();

6
src/blackmisc/propertyindexvariantmap.h
View File

@@ -219,12 +219,6 @@ namespace BlackMisc
//! \copydoc CValueObject::qHash
friend uint qHash(const CPropertyIndexVariantMap &vm) { return vm.getValueHash(); }
//! \copydoc CValueObject::toQVariant
QVariant toQVariant() const { return QVariant::fromValue(*this); }
//! \copydoc CValueObject::convertFromQVariant
void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); }
//! \copydoc CValueObject::convertToQString
QString convertToQString(bool i18n = false) const;

6
src/blackmisc/valueobject.h
View File

@@ -115,12 +115,6 @@ namespace BlackMisc
//! \copydoc BlackMisc::Mixin::JsonByTuple::convertFromJson
using Mixin::JsonByTuple<Derived>::convertFromJson;
//! \copydoc BlackMisc::Mixin::MetaType::toQVariant
using Mixin::MetaType<Derived>::toQVariant;
//! \copydoc BlackMisc::Mixin::MetaType::convertFromQVariant
using Mixin::MetaType<Derived>::convertFromQVariant;
//! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
using Mixin::Index<Derived>::setPropertyByIndex;

24
src/blackmisc/variant.h
View File

@@ -66,20 +66,6 @@ namespace BlackMisc
return baseIsA(static_cast<const MetaBaseOfT<Derived> *>(derived()), metaTypeId);
}
//! Return QVariant, used with DBus QVariant lists
//! \deprecated Use QVariant::fromValue() instead.
QVariant toQVariant() const
{
return Private::MetaTypeHelper<Derived>::maybeToQVariant(*derived());
}
//! Set from QVariant
//! \deprecated Use QVariant::value() instead.
void convertFromQVariant(const QVariant &variant)
{
return Private::MetaTypeHelper<Derived>::maybeConvertFromQVariant(*derived(), variant);
}
private:
const Derived *derived() const { return static_cast<const Derived *>(this); }
Derived *derived() { return static_cast<Derived *>(this); }
@@ -104,9 +90,7 @@ namespace BlackMisc
# define BLACKMISC_DECLARE_USING_MIXIN_METATYPE(DERIVED) \
using ::BlackMisc::Mixin::MetaType<DERIVED>::registerMetadata; \
using ::BlackMisc::Mixin::MetaType<DERIVED>::getMetaTypeId; \
using ::BlackMisc::Mixin::MetaType<DERIVED>::isA; \
using ::BlackMisc::Mixin::MetaType<DERIVED>::toQVariant; \
using ::BlackMisc::Mixin::MetaType<DERIVED>::convertFromQVariant;
using ::BlackMisc::Mixin::MetaType<DERIVED>::isA;
/*!
* When a derived class and a base class both inherit from Mixin::MetaType,
@@ -243,12 +227,6 @@ namespace BlackMisc
//! Return the internal QVariant.
const QVariant &getQVariant() const { return m_v; }
//! \copydoc CValueObject::toQVariant
QVariant toQVariant() const { return getQVariant(); }
//! \copydoc CValueObject::convertFromQVariant
void convertFromQVariant(const QVariant &v) { m_v = v; }
//! True if this variant can be converted to the type with the given metatype ID.
bool canConvert(int typeId) const { return m_v.canConvert(typeId); }