Queue::messageReceived no longer passes the queue as a parameter (use sender() if you need it)

fixed qamqp manual test to send key before message

src/amqp_message_p.h

@@ -0,0 +1,32 @@
+#ifndef amqp_message_p_h__
+#define amqp_message_p_h__
+
+#include <QHash>
+#include <QSharedData>
+
+#include "amqp_frame.h"
+#include "amqp_message.h"
+
+namespace QAMQP {
+
+class MessagePrivate : public QSharedData
+{
+public:
+    MessagePrivate();
+
+    qlonglong deliveryTag;
+    bool redelivered;
+    QString exchangeName;
+    QString routingKey;
+
+    QByteArray payload;
+    QHash<Message::MessageProperty, QVariant> properties;
+    Frame::TableField headers;
+
+    int leftSize;
+
+};
+
+}   // namespace QAMQP
+
+#endif  // amqp_message_p_h__

src/amqp_queue.cpp

@@ -111,7 +111,7 @@ void QueuePrivate::_q_body(const Frame::ContentBody &frame)
     message.d->payload.append(frame.body());
     message.d->leftSize -= frame.body().size();
     if (message.d->leftSize == 0 && messages.size() == 1)
-        Q_EMIT q->messageReceived(q);
+        Q_EMIT q->messageReceived();
 }
 
 void QueuePrivate::declareOk(const Frame::Method &frame)

src/amqp_queue.h

@@ -71,7 +71,7 @@ Q_SIGNALS:
     void bound();
     void unbound();
     void removed();
-    void messageReceived(Queue *pQueue);
+    void messageReceived();
     void empty();
 
 protected:

tests/auto/qamqpqueue/tst_qamqpqueue.cpp

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

tests/manual/qamqp/sendreceive/Send.h

@@ -63,7 +63,7 @@ protected slots:
           .arg(sendMsg_));
         qDebug() << "Send::sendMessage " << message;
 
-        exchange_->publish(message, "hello");
+        exchange_->publish("hello", message);
     }
 
 private: