convert QAMQP::Queue to a proper QQueue subclass, move MessageProperties to QAMQP namespace

src/amqp_exchange.cpp

@@ -196,7 +196,7 @@ void Exchange::publish(const QString &key, const QByteArray &message,
 
 void Exchange::publish(const QString &key, const QByteArray &message,
                        const QString &mimeType, const QVariantHash &headers,
-                       const Exchange::MessageProperties &properties)
+                       const MessageProperties &properties)
 {
     Q_D(Exchange);
     Frame::Method frame(Frame::fcBasic, ExchangePrivate::bmPublish);
@@ -220,8 +220,8 @@ void Exchange::publish(const QString &key, const QByteArray &message,
     content.setProperty(Frame::Content::cpHeaders, headers);
     content.setProperty(Frame::Content::cpMessageId, "0");
 
-    Exchange::MessageProperties::ConstIterator it;
+    MessageProperties::ConstIterator it;
-    Exchange::MessageProperties::ConstIterator itEnd = properties.constEnd();
+    MessageProperties::ConstIterator itEnd = properties.constEnd();
     for (it = properties.constBegin(); it != itEnd; ++it)
         content.setProperty(it.key(), it.value());
     content.setBody(message);

src/amqp_exchange.h

@@ -36,7 +36,6 @@ public:
     };
     Q_DECLARE_FLAGS(ExchangeOptions, ExchangeOption)
 
-    typedef QHash<Frame::Content::Property, QVariant> MessageProperties;
     ExchangeOptions option() const;
 
     virtual ~Exchange();
@@ -57,7 +56,7 @@ public:
                  const QString &mimeType, const MessageProperties &properties = MessageProperties());
     void publish(const QString &key, const QByteArray &message,
                  const QString &mimeType, const QVariantHash &headers,
-                 const Exchange::MessageProperties &properties = Exchange::MessageProperties());
+                 const MessageProperties &properties = MessageProperties());
 
 Q_SIGNALS:
     void declared();

src/amqp_frame.h

@@ -418,6 +418,8 @@ namespace Frame
 
 } // namespace Frame
 
+typedef QHash<Frame::Content::Property, QVariant> MessageProperties;
+
 } // namespace QAMQP
 
 Q_DECLARE_METATYPE(QAMQP::Frame::decimal)

src/amqp_queue.cpp

@@ -78,16 +78,17 @@ bool QueuePrivate::_q_method(const Frame::Method &frame)
 
 void QueuePrivate::_q_content(const Frame::Content &frame)
 {
+    Q_Q(Queue);
     Q_ASSERT(frame.channel() == channelNumber);
     if (frame.channel() != channelNumber)
         return;
 
-    if (messages.isEmpty()) {
+    if (q->isEmpty()) {
         qErrnoWarning("Received content-header without method frame before");
         return;
     }
 
-    Message message = messages.last();
+    Message message = q->last();
     message.d->leftSize = frame.bodySize();
     QHash<int, QVariant>::ConstIterator it;
     QHash<int, QVariant>::ConstIterator itEnd = frame.properties_.constEnd();
@@ -102,15 +103,15 @@ void QueuePrivate::_q_body(const Frame::ContentBody &frame)
     if (frame.channel() != channelNumber)
         return;
 
-    if (messages.isEmpty()) {
+    if (q->isEmpty()) {
         qErrnoWarning("Received content-body without method frame before");
         return;
     }
 
-    Message message = messages.last();
+    Message message = q->last();
     message.d->payload.append(frame.body());
     message.d->leftSize -= frame.body().size();
-    if (message.d->leftSize == 0 && messages.size() == 1)
+    if (message.d->leftSize == 0 && q->size() == 1)
         Q_EMIT q->messageReceived();
 }
 
@@ -166,6 +167,7 @@ void QueuePrivate::unbindOk(const Frame::Method &frame)
 
 void QueuePrivate::getOk(const Frame::Method &frame)
 {
+    Q_Q(Queue);
     QByteArray data = frame.arguments();
     QDataStream in(&data, QIODevice::ReadOnly);
 
@@ -174,7 +176,7 @@ void QueuePrivate::getOk(const Frame::Method &frame)
     message.d->redelivered = Frame::readField('t',in).toBool();
     message.d->exchangeName = Frame::readField('s',in).toString();
     message.d->routingKey = Frame::readField('s',in).toString();
-    messages.enqueue(message);
+    q->enqueue(message);
 }
 
 void QueuePrivate::consumeOk(const Frame::Method &frame)
@@ -188,6 +190,7 @@ void QueuePrivate::consumeOk(const Frame::Method &frame)
 
 void QueuePrivate::deliver(const Frame::Method &frame)
 {
+    Q_Q(Queue);
     qAmqpDebug() << Q_FUNC_INFO;
     QByteArray data = frame.arguments();
     QDataStream in(&data, QIODevice::ReadOnly);
@@ -202,7 +205,7 @@ void QueuePrivate::deliver(const Frame::Method &frame)
     message.d->redelivered = Frame::readField('t',in).toBool();
     message.d->exchangeName = Frame::readField('s',in).toString();
     message.d->routingKey = Frame::readField('s',in).toString();
-    messages.enqueue(message);
+    q->enqueue(message);
 }
 
 void QueuePrivate::declare()
@@ -399,22 +402,6 @@ void Queue::unbind(const QString &exchangeName, const QString &key)
     d->sendFrame(frame);
 }
 
-Message Queue::getMessage()
-{
-    Q_D(Queue);
-    return d->messages.dequeue();
-}
-
-bool Queue::hasMessage() const
-{
-    Q_D(const Queue);
-    if (d->messages.isEmpty())
-        return false;
-
-    const Message &message = d->messages.head();
-    return message.d->leftSize == 0;
-}
-
 void Queue::consume(int options)
 {
     Q_D(Queue);

src/amqp_queue.h

@@ -1,6 +1,8 @@
 #ifndef amqp_queue_h__
 #define amqp_queue_h__
 
+#include <QQueue>
+
 #include "amqp_channel.h"
 #include "amqp_message.h"
 #include "amqp_global.h"
@@ -12,7 +14,7 @@ class Client;
 class ClientPrivate;
 class Exchange;
 class QueuePrivate;
-class QAMQP_EXPORT Queue : public Channel
+class QAMQP_EXPORT Queue : public Channel, public QQueue<Message>
 {
     Q_OBJECT
     Q_ENUMS(QueueOptions)
@@ -52,9 +54,6 @@ public:
 
     ~Queue();
 
-    bool hasMessage() const;
-    Message getMessage();
-
     void setConsumerTag(const QString &consumerTag);
     QString consumerTag() const;
 

src/amqp_queue_p.h

@@ -44,7 +44,6 @@ public:
     bool noAck;
     QString consumerTag;
     QQueue<QPair<QString, QString> > delayedBindings;
-    QQueue<Message> messages;
     bool recievingMessage;
 
     Q_DECLARE_PUBLIC(Queue)

tests/auto/qamqpqueue/tst_qamqpqueue.cpp

@@ -60,7 +60,7 @@ void tst_QAMQPQueue::defaultExchange()
     Exchange *defaultExchange = client->createExchange();
     defaultExchange->publish("test-default-exchange", "first message");
     QVERIFY(waitForSignal(queue, SIGNAL(messageReceived())));
-    Message message = queue->getMessage();
+    Message message = queue->dequeue();
     QCOMPARE(message.payload(), QByteArray("first message"));
 }
 
@@ -93,7 +93,7 @@ void tst_QAMQPQueue::standardExchanges()
     Exchange *defaultExchange = client->createExchange(exchange);
     defaultExchange->publish(routingKey, "test message");
     QVERIFY(waitForSignal(queue, SIGNAL(messageReceived())));
-    QCOMPARE(queue->getMessage().payload(), QByteArray("test message"));
+    QCOMPARE(queue->dequeue().payload(), QByteArray("test message"));
 }
 
 void tst_QAMQPQueue::unnamed()

tests/manual/qamqp/pubsub/ReceiveLog.h

@@ -53,7 +53,7 @@ protected slots:
     void newMessage()
     {
         // Retrieve message
-        QAMQP::Message message = queue_->getMessage();
+        QAMQP::Message message = queue_->dequeue();
         qDebug() << "ReceiveLog::newMessage " << message.payload();
     }
 

tests/manual/qamqp/routing/ReceiveLogDirect.h

@@ -60,7 +60,7 @@ protected slots:
     void newMessage()
     {
         // Retrieve message
-        QAMQP::Message message = queue_->getMessage();
+        QAMQP::Message message = queue_->dequeue();
         qDebug() << "ReceiveLogDirect::newMessage " << message.payload();
     }
 

tests/manual/qamqp/sendreceive/Receive.h

@@ -50,14 +50,11 @@ protected slots:
 
     void newMessage()
     {
-        while (queue_->hasMessage())
+        while (!queue_->isEmpty()) {
-        {
+            QAMQP::Message message = queue_->dequeue();
-            QAMQP::Message message = queue_->getMessage();
             qDebug() << "Receive::newMessage " << message.payload();
-            if(!queue_->noAck())
+            if (!queue_->noAck())
-            {
                 queue_->ack(message);
-            }
         }
     }
 

tests/manual/qamqp/workqueues/NewTask.h

@@ -52,7 +52,7 @@ protected slots:
     {
         static quint64 counter = 0;
 
-        QAMQP::Exchange::MessageProperties properties;
+        QAMQP::MessageProperties properties;
         properties[QAMQP::Frame::Content::cpDeliveryMode] = 2; // Make message persistent
 
         QString message(QString("[%1: %2] Hello World! %3")

tests/manual/qamqp/workqueues/Worker.h

@@ -49,7 +49,7 @@ protected slots:
     void newMessage()
     {
         // Retrieve message
-        QAMQP::Message message = queue_->getMessage();
+        QAMQP::Message message = queue_->dequeue();
         qDebug() << "Worker::newMessage " << message.payload();
 
         // Simulate long processing