diff options
Diffstat (limited to 'src/dbus/qdbuspendingreply.h')
| -rw-r--r-- | src/dbus/qdbuspendingreply.h | 202 |
1 files changed, 82 insertions, 120 deletions
diff --git a/src/dbus/qdbuspendingreply.h b/src/dbus/qdbuspendingreply.h index 62e955a82b..580b967b3b 100644 --- a/src/dbus/qdbuspendingreply.h +++ b/src/dbus/qdbuspendingreply.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtDBus module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QDBUSPENDINGREPLY_H #define QDBUSPENDINGREPLY_H @@ -49,92 +13,58 @@ QT_BEGIN_NAMESPACE -class Q_DBUS_EXPORT QDBusPendingReplyData: public QDBusPendingCall +class Q_DBUS_EXPORT QDBusPendingReplyBase : public QDBusPendingCall { protected: - QDBusPendingReplyData(); - ~QDBusPendingReplyData(); + QDBusPendingReplyBase(); + ~QDBusPendingReplyBase(); void assign(const QDBusPendingCall &call); void assign(const QDBusMessage &message); QVariant argumentAt(int index) const; - void setMetaTypes(int count, const int *metaTypes); + void setMetaTypes(int count, const QMetaType *metaTypes); }; namespace QDBusPendingReplyTypes { - template<int Index, - typename T1, typename T2, typename T3, typename T4, - typename T5, typename T6, typename T7, typename T8> + template<int Index, typename T, typename... Types> struct Select { - typedef Select<Index - 1, T2, T3, T4, T5, T6, T7, T8, void> Next; + typedef Select<Index - 1, Types...> Next; typedef typename Next::Type Type; }; - template<typename T1, typename T2, typename T3, typename T4, - typename T5, typename T6, typename T7, typename T8> - struct Select<0, T1, T2, T3, T4, T5, T6, T7, T8> + template<typename T, typename... Types> + struct Select<0, T, Types...> { - typedef T1 Type; + typedef T Type; }; - template<typename T1> inline int metaTypeFor(T1 * = nullptr) - { return qMetaTypeId<T1>(); } + template<typename T> inline QMetaType metaTypeFor() + { return QMetaType::fromType<T>(); } // specialize for QVariant, allowing it to be used in place of QDBusVariant - template<> inline int metaTypeFor<QVariant>(QVariant *) - { return qMetaTypeId<QDBusVariant>(); } + template<> inline QMetaType metaTypeFor<QVariant>() + { return QMetaType::fromType<QDBusVariant>(); } +} - template<typename T1, typename T2, typename T3, typename T4, - typename T5, typename T6, typename T7, typename T8> - struct ForEach - { - typedef ForEach<T2, T3, T4, T5, T6, T7, T8, void> Next; - enum { Total = Next::Total + 1 }; - static inline void fillMetaTypes(int *p) - { - *p = metaTypeFor<T1>(nullptr); - Next::fillMetaTypes(++p); - } - }; - template<> - struct ForEach<void, void, void, void, void, void, void, void> - { - enum { Total = 0 }; - static inline void fillMetaTypes(int *) - { } - }; - struct TypeIsVoid {}; - template <typename T> struct NotVoid { typedef T Type; }; - template <> struct NotVoid<void> { typedef TypeIsVoid Type; }; -} // namespace QDBusPendingReplyTypes - -template<typename T1 = void, typename T2 = void, typename T3 = void, typename T4 = void, - typename T5 = void, typename T6 = void, typename T7 = void, typename T8 = void> -class QDBusPendingReply: -#ifdef Q_CLANG_QDOC - public QDBusPendingCall -#else - public QDBusPendingReplyData -#endif +template<typename... Types> +class QDBusPendingReply : public QDBusPendingReplyBase { - typedef QDBusPendingReplyTypes::ForEach<T1, T2, T3, T4, T5, T6, T7, T8> ForEach; - template<int Index> struct Select : - QDBusPendingReplyTypes::Select<Index, T1, T2, T3, T4, T5, T6, T7, T8> - { - }; - + template<int Index> using Select = QDBusPendingReplyTypes::Select<Index, Types...>; public: - enum { Count = ForEach::Total }; + enum { Count = std::is_same_v<typename Select<0>::Type, void> ? 0 : sizeof...(Types) }; - inline QDBusPendingReply() - { } + inline constexpr int count() const { return Count; } + + + inline QDBusPendingReply() = default; inline QDBusPendingReply(const QDBusPendingReply &other) - : QDBusPendingReplyData(other) + : QDBusPendingReplyBase(other) { } - inline /*implicit*/ QDBusPendingReply(const QDBusPendingCall &call) // required by qdbusxml2cpp-generated code + inline Q_IMPLICIT QDBusPendingReply(const QDBusPendingCall &call) // required by qdbusxml2cpp-generated code { *this = call; } - inline /*implicit*/ QDBusPendingReply(const QDBusMessage &message) + inline Q_IMPLICIT QDBusPendingReply(const QDBusMessage &message) { *this = message; } + inline QDBusPendingReply &operator=(const QDBusPendingReply &other) { assign(other); return *this; } inline QDBusPendingReply &operator=(const QDBusPendingCall &call) @@ -142,69 +72,101 @@ public: inline QDBusPendingReply &operator=(const QDBusMessage &message) { assign(message); return *this; } - inline int count() const { return Count; } - -#if defined(Q_CLANG_QDOC) - QVariant argumentAt(int index) const; -#else - using QDBusPendingReplyData::argumentAt; -#endif - -#ifndef Q_CLANG_QDOC + using QDBusPendingReplyBase::argumentAt; template<int Index> inline - const typename Select<Index>::Type argumentAt() const + typename Select<Index>::Type argumentAt() const { static_assert(Index >= 0 && Index < Count, "Index out of bounds"); typedef typename Select<Index>::Type ResultType; return qdbus_cast<ResultType>(argumentAt(Index)); } -#endif -#if defined(Q_CLANG_QDOC) +#if defined(Q_QDOC) bool isFinished() const; void waitForFinished(); + QVariant argumentAt(int index) const; bool isValid() const; bool isError() const; QDBusError error() const; QDBusMessage reply() const; +#endif - inline T1 value() const; - inline operator T1() const; -#else inline typename Select<0>::Type value() const { return argumentAt<0>(); } - inline operator typename QDBusPendingReplyTypes::NotVoid<T1>::Type() const + inline operator typename Select<0>::Type() const { return argumentAt<0>(); } -#endif private: inline void calculateMetaTypes() { if (!d) return; - int typeIds[Count > 0 ? Count : 1]; // use at least one since zero-sized arrays aren't valid - ForEach::fillMetaTypes(typeIds); - setMetaTypes(Count, typeIds); + if constexpr (Count == 0) { + setMetaTypes(0, nullptr); + } else { + std::array<QMetaType, Count> typeIds = { QDBusPendingReplyTypes::metaTypeFor<Types>()... }; + setMetaTypes(Count, typeIds.data()); + } } inline void assign(const QDBusPendingCall &call) { - QDBusPendingReplyData::assign(call); + QDBusPendingReplyBase::assign(call); calculateMetaTypes(); } inline void assign(const QDBusMessage &message) { - QDBusPendingReplyData::assign(message); + QDBusPendingReplyBase::assign(message); calculateMetaTypes(); } }; +template<> +class QDBusPendingReply<> : public QDBusPendingReplyBase +{ +public: + enum { Count = 0 }; + inline int count() const { return Count; } + + inline QDBusPendingReply() = default; + inline QDBusPendingReply(const QDBusPendingReply &other) + : QDBusPendingReplyBase(other) + { } + inline Q_IMPLICIT QDBusPendingReply(const QDBusPendingCall &call) // required by qdbusxml2cpp-generated code + { *this = call; } + inline Q_IMPLICIT QDBusPendingReply(const QDBusMessage &message) + { *this = message; } + + inline QDBusPendingReply &operator=(const QDBusPendingReply &other) + { assign(other); return *this; } + inline QDBusPendingReply &operator=(const QDBusPendingCall &call) + { assign(call); return *this; } + inline QDBusPendingReply &operator=(const QDBusMessage &message) + { assign(message); return *this; } + +private: + inline void assign(const QDBusPendingCall &call) + { + QDBusPendingReplyBase::assign(call); + if (d) + setMetaTypes(0, nullptr); + } + + inline void assign(const QDBusMessage &message) + { + QDBusPendingReplyBase::assign(message); + if (d) + setMetaTypes(0, nullptr); + } + +}; + QT_END_NAMESPACE #endif // QT_NO_DBUS |