make QXmppClientExtension and QXmppServerExtension inherit QObject

4 files changed, 8 insertions, 6 deletions

diff --git a/src/QXmppClient.cpp b/src/QXmppClient.cpp
index 023abf07..62a7f03d 100644
--- a/src/QXmppClient.cpp
+++ b/src/QXmppClient.cpp
@@ -178,8 +178,6 @@ QXmppClient::QXmppClient(QObject *parent)
 
 QXmppClient::~QXmppClient()
 {
-    foreach (QXmppClientExtension *extension, d->extensions)
-        delete extension;
     delete d;
 }
 
@@ -189,6 +187,7 @@ QXmppClient::~QXmppClient()
 
 void QXmppClient::addExtension(QXmppClientExtension *extension)
 {
+    extension->setParent(this);
     d->extensions << extension;
 }
 
diff --git a/src/QXmppClient.h b/src/QXmppClient.h
index e6360037..b6a800b1 100644
--- a/src/QXmppClient.h
+++ b/src/QXmppClient.h
@@ -245,8 +245,10 @@ private:
 /// extensions.
 ///
 
-class QXmppClientExtension
+class QXmppClientExtension : public QObject
 {
+    Q_OBJECT
+
 public:
     virtual bool handleStanza(QXmppStream *stream, const QDomElement &stanza) = 0;
 };
diff --git a/src/QXmppServer.cpp b/src/QXmppServer.cpp
index 0630eea6..947add18 100644
--- a/src/QXmppServer.cpp
+++ b/src/QXmppServer.cpp
@@ -97,8 +97,6 @@ QXmppServer::QXmppServer(QObject *parent)
 
 QXmppServer::~QXmppServer()
 {
-    foreach (QXmppServerExtension *extension, d->extensions)
-        delete extension;
     delete d;
 }
 
@@ -108,6 +106,7 @@ QXmppServer::~QXmppServer()
 
 void QXmppServer::addExtension(QXmppServerExtension *extension)
 {
+    extension->setParent(this);
     d->extensions << extension;
 }
 
diff --git a/src/QXmppServer.h b/src/QXmppServer.h
index 680a2fd5..9a06c55b 100644
--- a/src/QXmppServer.h
+++ b/src/QXmppServer.h
@@ -92,8 +92,10 @@ private:
 /// extensions.
 ///
 
-class QXmppServerExtension
+class QXmppServerExtension : public QObject
 {
+    Q_OBJECT
+
 public:
     virtual bool handleStanza(QXmppStream *stream, const QDomElement &stanza);
     virtual QStringList presenceSubscribers(const QString &jid);