1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup a ### Qt 6

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/dbus/qdbusargument.h
View File

@ -156,15 +156,14 @@ QT_END_NAMESPACE
Q_DECLARE_METATYPE(QDBusArgument) Q_DECLARE_METATYPE(QDBusArgument)
QT_BEGIN_NAMESPACE 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)
template<typename T> inline T qdbus_cast(const QDBusArgument &arg, T * = nullptr)
{ {
T item; T item;
arg >> item; arg >> item;
return 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(); int id = v.userType();
if (id == qMetaTypeId<QDBusArgument>()) 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 // 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; QDBusVariant item;
arg >> item; arg >> item;
return item.variant(); 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(); return qdbus_cast<QDBusVariant>(v).variant();
} }

2
src/dbus/qdbuspendingreply.h
View File

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