summaryrefslogtreecommitdiffstats
path: root/src/dbus
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2012-04-05 14:49:02 +0200
committerQt by Nokia <qt-info@nokia.com>2012-05-09 02:39:08 +0200
commitb58b777cb3df1df3725c601b655128ce875a8687 (patch)
treed80ce9ca9738d3fe42b277f7e59b984798091874 /src/dbus
parent7fbc80f0eb2325b6abc33286f02b065605eb4490 (diff)
QtDBus: add member-swap to shared classes
Implemented as in other shared classes (e.g. QPen). Change-Id: Ic827540b535fc5506165b5395b796a53a00bb096 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/dbus')
-rw-r--r--src/dbus/qdbuspendingcall.cpp8
-rw-r--r--src/dbus/qdbuspendingcall.h2
-rw-r--r--src/dbus/qdbusunixfiledescriptor.cpp8
-rw-r--r--src/dbus/qdbusunixfiledescriptor.h3
4 files changed, 21 insertions, 0 deletions
diff --git a/src/dbus/qdbuspendingcall.cpp b/src/dbus/qdbuspendingcall.cpp
index 9659afa2e5..3d5dc421d7 100644
--- a/src/dbus/qdbuspendingcall.cpp
+++ b/src/dbus/qdbuspendingcall.cpp
@@ -286,6 +286,14 @@ QDBusPendingCall &QDBusPendingCall::operator=(const QDBusPendingCall &other)
}
/*!
+ \fn void QDBusPendingCall::swap(QDBusPendingCall &other)
+ \since 5.0
+
+ Swaps this pending call instance with \a other. This function is
+ very fast and never fails.
+*/
+
+/*!
\fn bool QDBusPendingCallWatcher::isFinished() const
Returns true if the pending call has finished processing and the
diff --git a/src/dbus/qdbuspendingcall.h b/src/dbus/qdbuspendingcall.h
index 8655435501..0256c4cc6e 100644
--- a/src/dbus/qdbuspendingcall.h
+++ b/src/dbus/qdbuspendingcall.h
@@ -68,6 +68,8 @@ public:
~QDBusPendingCall();
QDBusPendingCall &operator=(const QDBusPendingCall &other);
+ void swap(QDBusPendingCall &other) { qSwap(d, other.d); }
+
#ifndef Q_QDOC
// pretend that they aren't here
bool isFinished() const;
diff --git a/src/dbus/qdbusunixfiledescriptor.cpp b/src/dbus/qdbusunixfiledescriptor.cpp
index bcf5f64a90..b5e8817ddc 100644
--- a/src/dbus/qdbusunixfiledescriptor.cpp
+++ b/src/dbus/qdbusunixfiledescriptor.cpp
@@ -187,6 +187,14 @@ QDBusUnixFileDescriptor::~QDBusUnixFileDescriptor()
}
/*!
+ \fn void QDBusUnixFileDescriptor::swap(QDBusUnixFileDescriptor &other)
+ \since 5.0
+
+ Swaps this file descriptor instance with \a other. This function
+ is very fast and never fails.
+*/
+
+/*!
Returns true if this Unix file descriptor is valid. A valid Unix file
descriptor is not -1.
diff --git a/src/dbus/qdbusunixfiledescriptor.h b/src/dbus/qdbusunixfiledescriptor.h
index bfb2262a31..9fe0b77230 100644
--- a/src/dbus/qdbusunixfiledescriptor.h
+++ b/src/dbus/qdbusunixfiledescriptor.h
@@ -68,6 +68,9 @@ public:
QDBusUnixFileDescriptor &operator=(const QDBusUnixFileDescriptor &other);
~QDBusUnixFileDescriptor();
+ void swap(QDBusUnixFileDescriptor &other)
+ { qSwap(d, other.d); }
+
bool isValid() const;
int fileDescriptor() const;