telepathy-qt: dbus-tubes: Code style fixes
Dario Freddi
drf at kemper.freedesktop.org
Tue Jul 3 15:08:39 PDT 2012
Module: telepathy-qt
Branch: master
Commit: 3baebebe49de4dfe6f7c39c2011db48410bff154
URL: http://cgit.freedesktop.org/telepathy/telepathy-qt/commit/?id=3baebebe49de4dfe6f7c39c2011db48410bff154
Author: Dario Freddi <dario.freddi at collabora.co.uk>
Date: Thu Mar 17 14:55:15 2011 +0100
dbus-tubes: Code style fixes
---
TelepathyQt/dbus-tube-channel.cpp | 15 ++++++---------
TelepathyQt/incoming-dbus-tube-channel.cpp | 5 ++---
TelepathyQt/outgoing-dbus-tube-channel.cpp | 3 +--
3 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/TelepathyQt/dbus-tube-channel.cpp b/TelepathyQt/dbus-tube-channel.cpp
index dda607a..78ee9a5 100644
--- a/TelepathyQt/dbus-tube-channel.cpp
+++ b/TelepathyQt/dbus-tube-channel.cpp
@@ -62,14 +62,14 @@ DBusTubeChannel::Private::~Private()
{
}
-void DBusTubeChannel::Private::extractProperties(const QVariantMap& props)
+void DBusTubeChannel::Private::extractProperties(const QVariantMap &props)
{
serviceName = qdbus_cast<QString>(props[QLatin1String("Service")]);
accessControls = qdbus_cast<UIntList>(props[QLatin1String("SupportedAccessControls")]);
extractParticipants(qdbus_cast<DBusTubeParticipants>(props[QLatin1String("DBusNames")]));
}
-void DBusTubeChannel::Private::extractParticipants(const Tp::DBusTubeParticipants& participants)
+void DBusTubeChannel::Private::extractParticipants(const Tp::DBusTubeParticipants &participants)
{
busNames.clear();
for (DBusTubeParticipants::const_iterator i = participants.constBegin();
@@ -80,8 +80,7 @@ void DBusTubeChannel::Private::extractParticipants(const Tp::DBusTubeParticipant
}
}
-void DBusTubeChannel::Private::introspectBusNamesMonitoring(
- DBusTubeChannel::Private *self)
+void DBusTubeChannel::Private::introspectBusNamesMonitoring(DBusTubeChannel::Private *self)
{
DBusTubeChannel *parent = self->parent;
@@ -102,8 +101,7 @@ void DBusTubeChannel::Private::introspectBusNamesMonitoring(
self->readinessHelper->setIntrospectCompleted(DBusTubeChannel::FeatureBusNamesMonitoring, true);
}
-void DBusTubeChannel::Private::introspectDBusTube(
- DBusTubeChannel::Private *self)
+void DBusTubeChannel::Private::introspectDBusTube(DBusTubeChannel::Private *self)
{
DBusTubeChannel *parent = self->parent;
@@ -288,7 +286,7 @@ QString DBusTubeChannel::address() const
*
* \returns A list of active connection ids known to this tube
*/
-QHash< ContactPtr, QString > DBusTubeChannel::busNames() const
+QHash<ContactPtr, QString> DBusTubeChannel::busNames() const
{
if (!isReady(FeatureBusNamesMonitoring)) {
warning() << "DBusTubeChannel::busNames() used with "
@@ -316,8 +314,7 @@ void DBusTubeChannel::gotDBusTubeProperties(QDBusPendingCallWatcher *watcher)
}
}
-void DBusTubeChannel::onDBusNamesChanged(
- const Tp::DBusTubeParticipants &added,
+void DBusTubeChannel::onDBusNamesChanged(const Tp::DBusTubeParticipants &added,
const Tp::UIntList &removed)
{
QHash<ContactPtr, QString> realAdded;
diff --git a/TelepathyQt/incoming-dbus-tube-channel.cpp b/TelepathyQt/incoming-dbus-tube-channel.cpp
index 2fe1df2..6931057 100644
--- a/TelepathyQt/incoming-dbus-tube-channel.cpp
+++ b/TelepathyQt/incoming-dbus-tube-channel.cpp
@@ -36,7 +36,7 @@ namespace Tp
struct TP_QT_NO_EXPORT IncomingDBusTubeChannel::Private
{
public:
- Private(IncomingDBusTubeChannel* parent);
+ Private(IncomingDBusTubeChannel *parent);
virtual ~Private();
// Public object
@@ -202,8 +202,7 @@ IncomingDBusTubeChannel::~IncomingDBusTubeChannel()
* \return A %PendingDBusTubeAccept which will finish as soon as the tube is ready to be used
* (hence in the Open state)
*/
-PendingDBusTubeAccept *IncomingDBusTubeChannel::acceptTube(
- bool requireCredentials)
+PendingDBusTubeAccept *IncomingDBusTubeChannel::acceptTube(bool requireCredentials)
{
SocketAccessControl accessControl = requireCredentials ?
SocketAccessControlCredentials :
diff --git a/TelepathyQt/outgoing-dbus-tube-channel.cpp b/TelepathyQt/outgoing-dbus-tube-channel.cpp
index 3a7a92c..9707496 100644
--- a/TelepathyQt/outgoing-dbus-tube-channel.cpp
+++ b/TelepathyQt/outgoing-dbus-tube-channel.cpp
@@ -170,8 +170,7 @@ OutgoingDBusTubeChannel::~OutgoingDBusTubeChannel()
* \returns A %PendingDBusTubeOffer which will finish as soon as the tube is ready to be used
* (hence in the Open state)
*/
-PendingDBusTubeOffer *OutgoingDBusTubeChannel::offerTube(
- const QVariantMap ¶meters,
+PendingDBusTubeOffer *OutgoingDBusTubeChannel::offerTube(const QVariantMap ¶meters,
bool requireCredentials)
{
SocketAccessControl accessControl = requireCredentials ?
More information about the telepathy-commits
mailing list