summaryrefslogtreecommitdiffstats
path: root/src/dbus/qdbusintegrator_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/dbus/qdbusintegrator_p.h')
-rw-r--r--src/dbus/qdbusintegrator_p.h35
1 files changed, 11 insertions, 24 deletions
diff --git a/src/dbus/qdbusintegrator_p.h b/src/dbus/qdbusintegrator_p.h
index 3e4f79c43c..62106e4c0b 100644
--- a/src/dbus/qdbusintegrator_p.h
+++ b/src/dbus/qdbusintegrator_p.h
@@ -50,7 +50,6 @@
#include "qcoreevent.h"
#include "qeventloop.h"
-#include "qhash.h"
#include "qobject.h"
#include "private/qobject_p.h"
#include "qlist.h"
@@ -77,10 +76,21 @@ struct QDBusSlotCache
int flags;
int slotIdx;
QVector<int> metaTypes;
+
+ void swap(Data &other) Q_DECL_NOTHROW
+ {
+ qSwap(flags, other.flags);
+ qSwap(slotIdx, other.slotIdx);
+ qSwap(metaTypes, other.metaTypes);
+ }
};
typedef QMultiHash<QString, Data> Hash;
Hash hash;
+
+ void swap(QDBusSlotCache &other) Q_DECL_NOTHROW { qSwap(hash, other.hash); }
};
+Q_DECLARE_SHARED(QDBusSlotCache::Data)
+Q_DECLARE_SHARED(QDBusSlotCache)
class QDBusCallDeliveryEvent: public QMetaCallEvent
{
@@ -123,29 +133,6 @@ private:
bool handled;
};
-class QDBusConnectionCallbackEvent : public QEvent
-{
-public:
- QDBusConnectionCallbackEvent()
- : QEvent(User), subtype(Subtype(0))
- { }
-
- DBusWatch *watch;
- union {
- int timerId;
- int fd;
- };
- int extra;
-
- enum Subtype {
- AddTimeout = 0,
- KillTimer,
- AddWatch,
- //RemoveWatch,
- ToggleWatch
- } subtype;
-};
-
QT_END_NAMESPACE
Q_DECLARE_METATYPE(QDBusSlotCache)