[Telepathy-commits] [telepathy-qt4/master] Make ContactManager a full-fledged QObject

[Olli Salli]

---
 TelepathyQt4/Client/connection.cpp      |    2 --
 TelepathyQt4/Client/contact-manager.cpp |    2 +-
 TelepathyQt4/Client/contact-manager.h   |    5 +++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/TelepathyQt4/Client/connection.cpp b/TelepathyQt4/Client/connection.cpp
index fa41f63..283f06f 100644
--- a/TelepathyQt4/Client/connection.cpp
+++ b/TelepathyQt4/Client/connection.cpp
@@ -238,8 +238,6 @@ Connection::Private::Private(Connection *parent)
 
 Connection::Private::~Private()
 {
-    delete contactManager;
-
     if (!handleContext) {
         // initial introspection is not done
         return;
diff --git a/TelepathyQt4/Client/contact-manager.cpp b/TelepathyQt4/Client/contact-manager.cpp
index 30d4c4e..87abdcd 100644
--- a/TelepathyQt4/Client/contact-manager.cpp
+++ b/TelepathyQt4/Client/contact-manager.cpp
@@ -145,7 +145,7 @@ PendingContacts *ContactManager::contactsForIdentifiers(const QStringList &ident
 }
 
 ContactManager::ContactManager(Connection *parent)
-    : mPriv(new Private)
+    : QObject(parent), mPriv(new Private)
 {
     mPriv->conn = parent;
 }
diff --git a/TelepathyQt4/Client/contact-manager.h b/TelepathyQt4/Client/contact-manager.h
index 88ca66e..cd0ce17 100644
--- a/TelepathyQt4/Client/contact-manager.h
+++ b/TelepathyQt4/Client/contact-manager.h
@@ -26,6 +26,8 @@
 #error IN_TELEPATHY_QT4_HEADER
 #endif
 
+#include <QObject>
+
 #include <QSet>
 
 #include <TelepathyQt4/Types>
@@ -37,10 +39,9 @@ namespace Client
 {
 
 class Connection;
-class Contact;
 class PendingContacts;
 
-class ContactManager
+class ContactManager : public QObject
 {
     public:
 
-- 
1.5.6.5