[Telepathy-commits] [telepathy-qt4/master] Connection: Renamed dbus connection from connection to bus.
Andre Moreira Magalhaes (andrunko)
andre.magalhaes at collabora.co.uk
Thu Jan 22 09:16:24 PST 2009
Connection: Renamed dbus connection from connection to bus, just for the sake of
standardization.
---
TelepathyQt4/Client/connection.cpp | 6 +++---
TelepathyQt4/Client/connection.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/TelepathyQt4/Client/connection.cpp b/TelepathyQt4/Client/connection.cpp
index e2dfae9..76f99a8 100644
--- a/TelepathyQt4/Client/connection.cpp
+++ b/TelepathyQt4/Client/connection.cpp
@@ -418,16 +418,16 @@ Connection::Connection(const QString& serviceName,
/**
* Construct a new Connection object.
*
- * \param connection QDBusConnection to use.
+ * \param bus QDBusConnection to use.
* \param serviceName Connection service name.
* \param objectPath Connection object path.
* \param parent Object parent.
*/
-Connection::Connection(const QDBusConnection& connection,
+Connection::Connection(const QDBusConnection& bus,
const QString& serviceName,
const QString& objectPath,
QObject* parent)
- : StatefulDBusProxy(connection, serviceName, objectPath, parent),
+ : StatefulDBusProxy(bus, serviceName, objectPath, parent),
OptionalInterfaceFactory<Connection>(this),
mPriv(new Private(*this))
{
diff --git a/TelepathyQt4/Client/connection.h b/TelepathyQt4/Client/connection.h
index 1997242..a726027 100644
--- a/TelepathyQt4/Client/connection.h
+++ b/TelepathyQt4/Client/connection.h
@@ -80,7 +80,7 @@ public:
const QString& objectPath,
QObject* parent = 0);
- Connection(const QDBusConnection& connection,
+ Connection(const QDBusConnection& bus,
const QString &serviceName,
const QString &objectPath,
QObject* parent = 0);
--
1.5.6.5
More information about the Telepathy-commits
mailing list