1 files changed, 29 insertions, 58 deletions

diff --git a/src/dbus/qdbusintegrator_p.h b/src/dbus/qdbusintegrator_p.h
index 3a459251f7..b0c349799a 100644
--- a/src/dbus/qdbusintegrator_p.h
+++ b/src/dbus/qdbusintegrator_p.h
@@ -1,42 +1,6 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Copyright (C) 2016 Intel Corporation.
-** 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.
+// Copyright (C) 2016 Intel Corporation.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 //
 //  W A R N I N G
@@ -82,18 +46,34 @@ struct QDBusSlotCache
 {
     struct Data
     {
-        int flags;
         int slotIdx;
         QList<QMetaType> metaTypes;
 
         void swap(Data &other) noexcept
         {
-            qSwap(flags,     other.flags);
             qSwap(slotIdx,   other.slotIdx);
             qSwap(metaTypes, other.metaTypes);
         }
     };
-    typedef QMultiHash<QString, Data> Hash;
+
+    struct Key
+    {
+        QString memberWithSignature;
+        QDBusConnection::RegisterOptions flags;
+
+        friend bool operator==(const Key &lhs, const Key &rhs) noexcept
+        {
+            return lhs.memberWithSignature == rhs.memberWithSignature && lhs.flags == rhs.flags;
+        }
+
+        friend size_t qHash(const QDBusSlotCache::Key &key, size_t seed = 0) noexcept
+        {
+            return qHashMulti(seed, key.memberWithSignature, key.flags);
+        }
+    };
+
+    using Hash = QHash<Key, Data>;
+
     Hash hash;
 
     void swap(QDBusSlotCache &other) noexcept { qSwap(hash, other.hash); }
@@ -105,19 +85,14 @@ class QDBusCallDeliveryEvent: public QAbstractMetaCallEvent
 {
 public:
     QDBusCallDeliveryEvent(const QDBusConnection &c, int id, QObject *sender,
-                           const QDBusMessage &msg, const QList<QMetaType> &types, int f = 0)
-        : QAbstractMetaCallEvent(sender, -1),
-          connection(c),
-          message(msg),
-          metaTypes(types),
-          id(id),
-          flags(f)
+                           const QDBusMessage &msg, const QList<QMetaType> &types)
+        : QAbstractMetaCallEvent(sender, -1), connection(c), message(msg), metaTypes(types), id(id)
     {
     }
 
     void placeMetaCall(QObject *object) override
     {
-        QDBusConnectionPrivate::d(connection)->deliverCall(object, flags, message, metaTypes, id);
+        QDBusConnectionPrivate::d(connection)->deliverCall(object, message, metaTypes, id);
     }
 
 private:
@@ -125,7 +100,6 @@ private:
     QDBusMessage message;
     QList<QMetaType> metaTypes;
     int id;
-    int flags;
 };
 
 class QDBusActivateObjectEvent: public QAbstractMetaCallEvent
@@ -153,23 +127,20 @@ class QDBusSpyCallEvent : public QAbstractMetaCallEvent
 {
 public:
     typedef void (*Hook)(const QDBusMessage&);
-    QDBusSpyCallEvent(QDBusConnectionPrivate *cp, const QDBusConnection &c, const QDBusMessage &msg,
-                      const Hook *hooks, int count)
-        : QAbstractMetaCallEvent(cp, 0), conn(c), msg(msg), hooks(hooks), hookCount(count)
+    QDBusSpyCallEvent(QDBusConnectionPrivate *cp, const QDBusConnection &c, const QDBusMessage &msg)
+        : QAbstractMetaCallEvent(cp, 0), conn(c), msg(msg)
     {}
     ~QDBusSpyCallEvent() override;
     void placeMetaCall(QObject *) override;
-    static inline void invokeSpyHooks(const QDBusMessage &msg, const Hook *hooks, int hookCount);
+    static inline void invokeSpyHooks(const QDBusMessage &msg);
 
     QDBusConnection conn;   // keeps the refcount in QDBusConnectionPrivate up
     QDBusMessage msg;
-    const Hook *hooks;
-    int hookCount;
 };
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QDBusSlotCache)
+QT_DECL_METATYPE_EXTERN(QDBusSlotCache, Q_DBUS_EXPORT)
 
 #endif // QT_NO_DBUS
 #endif