diff options
Diffstat (limited to 'src/dbus/qdbusargument.h')
-rw-r--r-- | src/dbus/qdbusargument.h | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/src/dbus/qdbusargument.h b/src/dbus/qdbusargument.h index c0bce586ac..a3a6f990fc 100644 --- a/src/dbus/qdbusargument.h +++ b/src/dbus/qdbusargument.h @@ -55,8 +55,6 @@ #ifndef QT_NO_DBUS -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -397,10 +395,25 @@ inline QDBusArgument &operator<<(QDBusArgument &arg, const QVariantHash &map) return arg; } +template <typename T1, typename T2> +inline QDBusArgument &operator<<(QDBusArgument &arg, const QPair<T1, T2> &pair) +{ + arg.beginStructure(); + arg << pair.first << pair.second; + arg.endStructure(); + return arg; +} -QT_END_NAMESPACE +template <typename T1, typename T2> +inline const QDBusArgument &operator>>(const QDBusArgument &arg, QPair<T1, T2> &pair) +{ + arg.beginStructure(); + arg >> pair.first >> pair.second; + arg.endStructure(); + return arg; +} -QT_END_HEADER +QT_END_NAMESPACE #endif // QT_NO_DBUS #endif |