From 0bbe151263ceffd4cf7ab9497fffa425284d3108 Mon Sep 17 00:00:00 2001
From: Jeremy Lainé <jeremy.laine@m4x.org>
Date: Mon, 23 Apr 2012 20:01:59 +0000
Subject: make QXmppElementList a typedef (thanks Matt)

---
 src/base/QXmppElement.cpp           | 16 ----------------
 src/base/QXmppElement.h             |  9 +--------
 src/client/QXmppMucManager.cpp      |  4 ++--
 src/client/QXmppTransferManager.cpp |  2 +-
 4 files changed, 4 insertions(+), 27 deletions(-)

(limited to 'src')

diff --git a/src/base/QXmppElement.cpp b/src/base/QXmppElement.cpp
index 904ab473..8832038c 100644
--- a/src/base/QXmppElement.cpp
+++ b/src/base/QXmppElement.cpp
@@ -223,19 +223,3 @@ void QXmppElement::toXml(QXmlStreamWriter *writer) const
         child.toXml(writer);
     writer->writeEndElement();
 }
-
-QXmppElementList::QXmppElementList()
-{
-}
-
-QXmppElementList::QXmppElementList(const QXmppElement &element)
-{
-    append(element);
-}
-
-
-QXmppElementList::QXmppElementList(const QList<QXmppElement> &other)
-    : QList<QXmppElement>(other)
-{
-}
-
diff --git a/src/base/QXmppElement.h b/src/base/QXmppElement.h
index b8da1f16..1bf2a7fa 100644
--- a/src/base/QXmppElement.h
+++ b/src/base/QXmppElement.h
@@ -34,14 +34,7 @@ class QDomElement;
 class QXmppElement;
 class QXmppElementPrivate;
 
-class QXMPP_EXPORT QXmppElementList : public QList<QXmppElement>
-{
-public:
-    QXmppElementList();
-    QXmppElementList(const QXmppElement &element);
-    QXmppElementList(const QList<QXmppElement> &other);
-};
-
+typedef QList<QXmppElement> QXmppElementList;
 class QXMPP_EXPORT QXmppElement
 {
 public:
diff --git a/src/client/QXmppMucManager.cpp b/src/client/QXmppMucManager.cpp
index eead5df7..9192b2c7 100644
--- a/src/client/QXmppMucManager.cpp
+++ b/src/client/QXmppMucManager.cpp
@@ -261,7 +261,7 @@ bool QXmppMucRoom::join()
         p.setValue(d->password);
         x.appendChild(p);
     }
-    packet.setExtensions(x);
+    packet.setExtensions(QXmppElementList() << x);
     return d->client->sendPacket(packet);
 }
 
@@ -330,7 +330,7 @@ bool QXmppMucRoom::sendInvitation(const QString &jid, const QString &reason)
     QXmppMessage message;
     message.setTo(jid);
     message.setType(QXmppMessage::Normal);
-    message.setExtensions(x);
+    message.setExtensions(QXmppElementList() << x);
     return d->client->sendPacket(message);
 }
 
diff --git a/src/client/QXmppTransferManager.cpp b/src/client/QXmppTransferManager.cpp
index 77b82675..4eb6e58f 100644
--- a/src/client/QXmppTransferManager.cpp
+++ b/src/client/QXmppTransferManager.cpp
@@ -1186,7 +1186,7 @@ void QXmppTransferManager::_q_jobStateChanged(QXmppTransferJob::State state)
     response.setId(job->d->offerId);
     response.setType(QXmppIq::Result);
     response.setProfile(QXmppStreamInitiationIq::FileTransfer);
-    response.setSiItems(feature);
+    response.setSiItems(QXmppElementList() << feature);
 
     client()->sendPacket(response);
 
-- 
cgit v1.2.3