Cleanup a ### Qt 6

Change-Id: If9dd04e25ddc5164cc23ac7d5684254e38b7eda6
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Lars Knoll 2020-09-03 09:56:49 +02:00
parent 996e08734e
commit 1cf08cbc5b
2 changed files with 5 additions and 6 deletions

View File

@ -156,15 +156,14 @@ QT_END_NAMESPACE
Q_DECLARE_METATYPE(QDBusArgument)
QT_BEGIN_NAMESPACE
// ### Qt6: remove the defaulted T * = nullptr from these two (MSVC6 work-around):
template<typename T> inline T qdbus_cast(const QDBusArgument &arg, T * = nullptr)
template<typename T> inline T qdbus_cast(const QDBusArgument &arg)
{
T item;
arg >> item;
return item;
}
template<typename T> inline T qdbus_cast(const QVariant &v, T * = nullptr)
template<typename T> inline T qdbus_cast(const QVariant &v)
{
int id = v.userType();
if (id == qMetaTypeId<QDBusArgument>())
@ -174,13 +173,13 @@ template<typename T> inline T qdbus_cast(const QVariant &v, T * = nullptr)
}
// specialize for QVariant, allowing it to be used in place of QDBusVariant
template<> inline QVariant qdbus_cast<QVariant>(const QDBusArgument &arg, QVariant *)
template<> inline QVariant qdbus_cast<QVariant>(const QDBusArgument &arg)
{
QDBusVariant item;
arg >> item;
return item.variant();
}
template<> inline QVariant qdbus_cast<QVariant>(const QVariant &v, QVariant *)
template<> inline QVariant qdbus_cast<QVariant>(const QVariant &v)
{
return qdbus_cast<QDBusVariant>(v).variant();
}

View File

@ -156,7 +156,7 @@ public:
{
static_assert(Index >= 0 && Index < Count, "Index out of bounds");
typedef typename Select<Index>::Type ResultType;
return qdbus_cast<ResultType>(argumentAt(Index), nullptr);
return qdbus_cast<ResultType>(argumentAt(Index));
}
#endif