From b5d77e17e375c3eb27282b90fd8732f726a0cdf3 Mon Sep 17 00:00:00 2001
From: Matt Broadstone <mbroadstone@devonit.com>
Date: Tue, 17 Jun 2014 15:14:23 -0400
Subject: [PATCH] revert reordering publish arguments

I originally changed the publishing arguments to take a routingKey first
which is pretty nonstandard across implementations. Reverting for
conformity.
---
 src/amqp_exchange.cpp                    | 12 ++++++------
 src/amqp_exchange.h                      |  6 +++---
 tests/auto/qamqpqueue/tst_qamqpqueue.cpp | 12 ++++++------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/amqp_exchange.cpp b/src/amqp_exchange.cpp
index 0e76192..8e58d61 100644
--- a/src/amqp_exchange.cpp
+++ b/src/amqp_exchange.cpp
@@ -174,19 +174,19 @@ void Exchange::remove(int options)
     d->sendFrame(frame);
 }
 
-void Exchange::publish(const QString &key, const QString &message,
+void Exchange::publish(const QString &message, const QString &routingKey,
                        const MessageProperties &properties)
 {
-    publish(key, message.toUtf8(), QLatin1String("text.plain"), QVariantHash(), properties);
+    publish(message.toUtf8(), routingKey, QLatin1String("text.plain"), QVariantHash(), properties);
 }
 
-void Exchange::publish(const QString &key, const QByteArray &message,
+void Exchange::publish(const QByteArray &message, const QString &routingKey,
                        const QString &mimeType, const MessageProperties &properties)
 {
-    publish(key, message, mimeType, QVariantHash(), properties);
+    publish(message, routingKey, mimeType, QVariantHash(), properties);
 }
 
-void Exchange::publish(const QString &key, const QByteArray &message,
+void Exchange::publish(const QByteArray &message, const QString &routingKey,
                        const QString &mimeType, const QVariantHash &headers,
                        const MessageProperties &properties)
 {
@@ -199,7 +199,7 @@ void Exchange::publish(const QString &key, const QByteArray &message,
 
     out << qint16(0);   //reserved 1
     Frame::writeField('s', out, d->name);
-    Frame::writeField('s', out, key);
+    Frame::writeField('s', out, routingKey);
     out << qint8(0);
 
     frame.setArguments(arguments);
diff --git a/src/amqp_exchange.h b/src/amqp_exchange.h
index 0ce303e..d7768f4 100644
--- a/src/amqp_exchange.h
+++ b/src/amqp_exchange.h
@@ -56,11 +56,11 @@ public:
     void remove(int options = roIfUnused|roNoWait);
 
     // AMQP Basic
-    void publish(const QString &key, const QString &message,
+    void publish(const QString &message, const QString &routingKey,
                  const MessageProperties &properties = MessageProperties());
-    void publish(const QString &key, const QByteArray &message,
+    void publish(const QByteArray &message, const QString &routingKey,
                  const QString &mimeType, const MessageProperties &properties = MessageProperties());
-    void publish(const QString &key, const QByteArray &message,
+    void publish(const QByteArray &message, const QString &routingKey,
                  const QString &mimeType, const QVariantHash &headers,
                  const MessageProperties &properties = MessageProperties());
 
diff --git a/tests/auto/qamqpqueue/tst_qamqpqueue.cpp b/tests/auto/qamqpqueue/tst_qamqpqueue.cpp
index f1c649c..ab91f42 100644
--- a/tests/auto/qamqpqueue/tst_qamqpqueue.cpp
+++ b/tests/auto/qamqpqueue/tst_qamqpqueue.cpp
@@ -59,7 +59,7 @@ void tst_QAMQPQueue::defaultExchange()
     queue->consume();
 
     Exchange *defaultExchange = client->createExchange();
-    defaultExchange->publish("test-default-exchange", "first message");
+    defaultExchange->publish("first message", "test-default-exchange");
     QVERIFY(waitForSignal(queue, SIGNAL(messageReceived())));
     Message message = queue->dequeue();
     QCOMPARE(message.payload(), QByteArray("first message"));
@@ -92,7 +92,7 @@ void tst_QAMQPQueue::standardExchanges()
     QVERIFY(waitForSignal(queue, SIGNAL(bound())));
 
     Exchange *defaultExchange = client->createExchange(exchange);
-    defaultExchange->publish(routingKey, "test message");
+    defaultExchange->publish("test message", routingKey);
     QVERIFY(waitForSignal(queue, SIGNAL(messageReceived())));
     QCOMPARE(queue->dequeue().payload(), QByteArray("test message"));
 }
@@ -219,7 +219,7 @@ void tst_QAMQPQueue::removeIfEmpty()
     queue->declare(Queue::Durable);
     QVERIFY(waitForSignal(queue, SIGNAL(declared())));
     Exchange *defaultExchange = client->createExchange();
-    defaultExchange->publish("test-remove-if-empty", "first message");
+    defaultExchange->publish("first message", "test-remove-if-empty");
 
     // create a second client and try to delete the queue
     {
@@ -264,9 +264,9 @@ void tst_QAMQPQueue::purge()
     queue->declare(Queue::Durable);
     QVERIFY(waitForSignal(queue, SIGNAL(declared())));
     Exchange *defaultExchange = client->createExchange();
-    defaultExchange->publish("test-purge", "first message");
-    defaultExchange->publish("test-purge", "second message");
-    defaultExchange->publish("test-purge", "third message");
+    defaultExchange->publish("first message", "test-purge");
+    defaultExchange->publish("second message", "test-purge");
+    defaultExchange->publish("third message", "test-purge");
 
     // create second client to listen to messages and attempt purge
     {