[Telepathy-commits] [telepathy-qt4/master] Make the ContactManager the parent for PendingContacts and Contact
Olli Salli
olli.salli at collabora.co.uk
Fri Jan 30 06:57:21 PST 2009
---
TelepathyQt4/Client/contact-manager.cpp | 4 ++--
TelepathyQt4/Client/contact.cpp | 14 +++++++-------
TelepathyQt4/Client/contact.h | 6 +++---
TelepathyQt4/Client/pending-contacts.cpp | 26 +++++++++++++-------------
TelepathyQt4/Client/pending-contacts.h | 5 ++---
tests/dbus/contacts.cpp | 8 ++++----
6 files changed, 31 insertions(+), 32 deletions(-)
diff --git a/TelepathyQt4/Client/contact-manager.cpp b/TelepathyQt4/Client/contact-manager.cpp
index 87abdcd..45735b9 100644
--- a/TelepathyQt4/Client/contact-manager.cpp
+++ b/TelepathyQt4/Client/contact-manager.cpp
@@ -114,7 +114,7 @@ PendingContacts *ContactManager::contactsForHandles(const UIntList &handles,
PendingContactAttributes *attributes =
mPriv->conn->getContactAttributes(handles, interfaces.toList(), true);
- PendingContacts *contacts = new PendingContacts(mPriv->conn, handles, features);
+ PendingContacts *contacts = new PendingContacts(this, handles, features);
contacts->connect(attributes,
SIGNAL(finished(Telepathy::Client::PendingOperation*)),
SLOT(onAttributesFinished(Telepathy::Client::PendingOperation*)));
@@ -136,7 +136,7 @@ PendingContacts *ContactManager::contactsForIdentifiers(const QStringList &ident
PendingHandles *handles = mPriv->conn->requestHandles(HandleTypeContact, identifiers);
- PendingContacts *contacts = new PendingContacts(mPriv->conn, identifiers, features);
+ PendingContacts *contacts = new PendingContacts(this, identifiers, features);
contacts->connect(handles,
SIGNAL(finished(Telepathy::Client::PendingOperation*)),
SLOT(onHandlesFinished(Telepathy::Client::PendingOperation*)));
diff --git a/TelepathyQt4/Client/contact.cpp b/TelepathyQt4/Client/contact.cpp
index 57cbcbd..f513f56 100644
--- a/TelepathyQt4/Client/contact.cpp
+++ b/TelepathyQt4/Client/contact.cpp
@@ -35,19 +35,19 @@ namespace Client
struct Contact::Private
{
- Private(Connection *connection, const ReferencedHandles &handle)
- : connection(connection), handle(handle)
+ Private(ContactManager *manager, const ReferencedHandles &handle)
+ : manager(manager), handle(handle)
{
}
- Connection *connection;
+ ContactManager *manager;
ReferencedHandles handle;
QString id;
};
-Connection *Contact::connection() const
+ContactManager *Contact::manager() const
{
- return mPriv->connection;
+ return mPriv->manager;
}
ReferencedHandles Contact::handle() const
@@ -65,9 +65,9 @@ Contact::~Contact()
delete mPriv;
}
-Contact::Contact(Connection *connection, const ReferencedHandles &handle,
+Contact::Contact(ContactManager *manager, const ReferencedHandles &handle,
const QVariantMap &attributes)
- : QObject(0), mPriv(new Private(connection, handle))
+ : QObject(0), mPriv(new Private(manager, handle))
{
debug() << this << "initialized with" << attributes.size() << "attributes";
diff --git a/TelepathyQt4/Client/contact.h b/TelepathyQt4/Client/contact.h
index 4520d54..42f4bf7 100644
--- a/TelepathyQt4/Client/contact.h
+++ b/TelepathyQt4/Client/contact.h
@@ -33,7 +33,6 @@ namespace Telepathy
{
namespace Client
{
-class Connection;
class ContactManager;
class ReferencedHandles;
@@ -47,7 +46,7 @@ public:
};
Q_DECLARE_FLAGS(Features, Feature);
- Connection *connection() const;
+ ContactManager *manager() const;
ReferencedHandles handle() const;
QString id() const;
@@ -57,7 +56,8 @@ public:
private:
Q_DISABLE_COPY(Contact);
- Contact(Connection *parent, const ReferencedHandles &handle, const QVariantMap &attributes);
+ Contact(ContactManager *manager, const ReferencedHandles &handle,
+ const QVariantMap &attributes);
struct Private;
friend class PendingContacts;
diff --git a/TelepathyQt4/Client/pending-contacts.cpp b/TelepathyQt4/Client/pending-contacts.cpp
index f3ec9f0..d5188c2 100644
--- a/TelepathyQt4/Client/pending-contacts.cpp
+++ b/TelepathyQt4/Client/pending-contacts.cpp
@@ -22,7 +22,6 @@
#include <TelepathyQt4/Client/PendingContacts>
#include "TelepathyQt4/Client/_gen/pending-contacts.moc.hpp"
-#include <TelepathyQt4/Client/Connection>
#include <TelepathyQt4/Client/ContactManager>
#include <TelepathyQt4/Client/PendingContactAttributes>
#include <TelepathyQt4/Client/PendingHandles>
@@ -37,8 +36,9 @@ namespace Client
struct PendingContacts::Private
{
- Private(Connection *connection, const UIntList &handles, const QSet<Contact::Feature> &features)
- : connection(connection),
+ Private(ContactManager *manager, const UIntList &handles,
+ const QSet<Contact::Feature> &features)
+ : manager(manager),
features(features),
isForIdentifiers(false),
handles(handles),
@@ -46,9 +46,9 @@ struct PendingContacts::Private
{
}
- Private(Connection *connection, const QStringList &identifiers,
+ Private(ContactManager *manager, const QStringList &identifiers,
const QSet<Contact::Feature> &features)
- : connection(connection),
+ : manager(manager),
features(features),
isForIdentifiers(true),
identifiers(identifiers),
@@ -56,7 +56,7 @@ struct PendingContacts::Private
{
}
- Connection *connection;
+ ContactManager *manager;
QSet<Contact::Feature> features;
bool isForIdentifiers;
@@ -78,7 +78,7 @@ PendingContacts::~PendingContacts()
ContactManager *PendingContacts::contactManager() const
{
- return mPriv->connection->contactManager();
+ return mPriv->manager;
}
QSet<Contact::Feature> PendingContacts::features() const
@@ -162,7 +162,7 @@ void PendingContacts::onAttributesFinished(PendingOperation *operation)
for (int i = 0; i < validHandles.size(); i++) {
uint handle = validHandles[i];
ReferencedHandles referenced = validHandles.mid(i, 1);
- mPriv->contacts.push_back(QSharedPointer<Contact>(new Contact(mPriv->connection, referenced,
+ mPriv->contacts.push_back(QSharedPointer<Contact>(new Contact(mPriv->manager, referenced,
attributes[handle])));
}
@@ -208,16 +208,16 @@ void PendingContacts::onNestedFinished(PendingOperation *operation)
setFinished();
}
-PendingContacts::PendingContacts(Connection *connection,
+PendingContacts::PendingContacts(ContactManager *manager,
const UIntList &handles, const QSet<Contact::Feature> &features)
- : PendingOperation(connection),
- mPriv(new Private(connection, handles, features))
+ : PendingOperation(manager),
+ mPriv(new Private(manager, handles, features))
{
}
-PendingContacts::PendingContacts(Connection *connection,
+PendingContacts::PendingContacts(ContactManager *manager,
const QStringList &identifiers, const QSet<Contact::Feature> &features)
- : PendingOperation(connection), mPriv(new Private(connection, identifiers, features))
+ : PendingOperation(manager), mPriv(new Private(manager, identifiers, features))
{
}
diff --git a/TelepathyQt4/Client/pending-contacts.h b/TelepathyQt4/Client/pending-contacts.h
index ac7ac7f..b19f6a6 100644
--- a/TelepathyQt4/Client/pending-contacts.h
+++ b/TelepathyQt4/Client/pending-contacts.h
@@ -41,7 +41,6 @@ namespace Telepathy
namespace Client
{
-class Connection;
class ContactManager;
class PendingContacts : public PendingOperation
@@ -70,9 +69,9 @@ private Q_SLOTS:
private:
Q_DISABLE_COPY(PendingContacts);
- PendingContacts(Connection *connection, const UIntList &handles,
+ PendingContacts(ContactManager *manager, const UIntList &handles,
const QSet<Contact::Feature> &features);
- PendingContacts(Connection *connection, const QStringList &identifiers,
+ PendingContacts(ContactManager *manager, const QStringList &identifiers,
const QSet<Contact::Feature> &features);
struct Private;
diff --git a/tests/dbus/contacts.cpp b/tests/dbus/contacts.cpp
index 740e2f0..aeb27f0 100644
--- a/tests/dbus/contacts.cpp
+++ b/tests/dbus/contacts.cpp
@@ -225,9 +225,9 @@ void TestContacts::testForHandles()
QVERIFY(mContacts[1] != NULL);
QVERIFY(mContacts[2] != NULL);
- QCOMPARE(mContacts[0]->connection(), mConn);
- QCOMPARE(mContacts[1]->connection(), mConn);
- QCOMPARE(mContacts[2]->connection(), mConn);
+ QCOMPARE(mContacts[0]->manager(), mConn->contactManager());
+ QCOMPARE(mContacts[1]->manager(), mConn->contactManager());
+ QCOMPARE(mContacts[2]->manager(), mConn->contactManager());
QCOMPARE(mContacts[0]->handle()[0], handles[0]);
QCOMPARE(mContacts[1]->handle()[0], handles[1]);
@@ -295,7 +295,7 @@ void TestContacts::testForIdentifiers()
for (int i = 0; i < mContacts.size(); i++) {
QVERIFY(mContacts[i] != NULL);
- QCOMPARE(mContacts[i]->connection(), mConn);
+ QCOMPARE(mContacts[i]->manager(), mConn->contactManager());
QVERIFY(tp_handle_is_valid(serviceRepo, mContacts[i]->handle()[0], NULL));
}
--
1.5.6.5
More information about the telepathy-commits
mailing list