From baa5c1de3e24b3540885b7539d44ef73f1e671cc Mon Sep 17 00:00:00 2001
From: Matt Broadstone <mbroadstone@devonit.com>
Date: Fri, 8 Aug 2014 08:20:31 -0400
Subject: [PATCH] refactor Channel::channelClose to just Channel::close

---
 src/amqp_channel.cpp                           | 4 ++--
 src/amqp_channel.h                             | 2 +-
 tests/auto/qamqpexchange/tst_qamqpexchange.cpp | 6 +++++-
 tests/auto/qamqpqueue/tst_qamqpqueue.cpp       | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/amqp_channel.cpp b/src/amqp_channel.cpp
index 7d896c0..8f28675 100644
--- a/src/amqp_channel.cpp
+++ b/src/amqp_channel.cpp
@@ -255,7 +255,7 @@ Channel::~Channel()
 {
 }
 
-void Channel::closeChannel()
+void Channel::close()
 {
     Q_D(Channel);
     d->needOpen = true;
@@ -267,7 +267,7 @@ void Channel::reopen()
 {
     Q_D(Channel);
     if (d->opened)
-        closeChannel();
+        close();
     d->open();
 }
 
diff --git a/src/amqp_channel.h b/src/amqp_channel.h
index 8dedb4b..49a687a 100644
--- a/src/amqp_channel.h
+++ b/src/amqp_channel.h
@@ -34,7 +34,7 @@ public:
     void qos(qint16 prefetchCount, qint32 prefetchSize = 0);
 
 public Q_SLOTS:
-    void closeChannel();
+    void close();
     void reopen();
     void resume();
 
diff --git a/tests/auto/qamqpexchange/tst_qamqpexchange.cpp b/tests/auto/qamqpexchange/tst_qamqpexchange.cpp
index 740d0f6..6cec2a0 100644
--- a/tests/auto/qamqpexchange/tst_qamqpexchange.cpp
+++ b/tests/auto/qamqpexchange/tst_qamqpexchange.cpp
@@ -175,8 +175,12 @@ void tst_QAMQPExchange::closeChannel()
     QVERIFY(waitForSignal(exchange, SIGNAL(opened())));
     exchange->declare(Exchange::Direct);
     QVERIFY(waitForSignal(exchange, SIGNAL(declared())));
-    exchange->closeChannel();
+    exchange->close();
     QVERIFY(waitForSignal(exchange, SIGNAL(closed())));
+    exchange->reopen();
+    QVERIFY(waitForSignal(exchange, SIGNAL(opened())));
+    exchange->remove(Exchange::roForce);
+    QVERIFY(waitForSignal(exchange, SIGNAL(removed())));
 }
 
 QTEST_MAIN(tst_QAMQPExchange)
diff --git a/tests/auto/qamqpqueue/tst_qamqpqueue.cpp b/tests/auto/qamqpqueue/tst_qamqpqueue.cpp
index b7dfa82..4a5858f 100644
--- a/tests/auto/qamqpqueue/tst_qamqpqueue.cpp
+++ b/tests/auto/qamqpqueue/tst_qamqpqueue.cpp
@@ -672,7 +672,7 @@ void tst_QAMQPQueue::closeChannel()
     QVERIFY(waitForSignal(queue, SIGNAL(opened())));
     declareQueueAndVerifyConsuming(queue);
 
-    queue->closeChannel();
+    queue->close();
     QVERIFY(waitForSignal(queue, SIGNAL(closed())));
 }