diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-26 18:33:02 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-01-26 19:40:45 +0000 |
| commit | f3060312c89344744832e3352fe4f53efcb94c9b (patch) | |
| tree | de69be5e25a1acd3207a8952376f634fe94fefcc /src/dbus/qdbusintegrator_p.h | |
| parent | c29d3692d700f7ef6d5833242878b4ec6f81c928 (diff) | |
| parent | a15c3d086dafea83e4760f0b447be43d26b80697 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev
Diffstat (limited to 'src/dbus/qdbusintegrator_p.h')
| -rw-r--r-- | src/dbus/qdbusintegrator_p.h | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/src/dbus/qdbusintegrator_p.h b/src/dbus/qdbusintegrator_p.h index 90ae1fc6a6..89043148e3 100644 --- a/src/dbus/qdbusintegrator_p.h +++ b/src/dbus/qdbusintegrator_p.h @@ -1,6 +1,7 @@ /**************************************************************************** ** ** 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. @@ -71,6 +72,7 @@ QT_BEGIN_NAMESPACE class QDBusConnectionPrivate; +class QDBusMessage; // Really private structs used by qdbusintegrator.cpp // Things that aren't used by any other file @@ -139,6 +141,23 @@ private: bool handled; }; +class QDBusSpyCallEvent : public QMetaCallEvent +{ +public: + typedef void (*Hook)(const QDBusMessage&); + QDBusSpyCallEvent(QDBusConnectionPrivate *cp, const QDBusConnection &c, const QDBusMessage &msg, + const Hook *hooks, int count) + : QMetaCallEvent(0, 0, Q_NULLPTR, cp, 0), conn(c), msg(msg), hooks(hooks), hookCount(count) + {} + ~QDBusSpyCallEvent(); + void placeMetaCall(QObject *) Q_DECL_OVERRIDE; + + QDBusConnection conn; // keeps the refcount in QDBusConnectionPrivate up + QDBusMessage msg; + const Hook *hooks; + int hookCount; +}; + QT_END_NAMESPACE Q_DECLARE_METATYPE(QDBusSlotCache) |