From 8e2b66677d217cf1129c995d1621b9f7b664811d Mon Sep 17 00:00:00 2001
From: Matt Broadstone <mbroadstone@devonit.com>
Date: Tue, 10 Jun 2014 21:27:59 -0400
Subject: [PATCH] add roForce to Queue, replace forceRemove

---
 src/amqp_queue.cpp                       | 5 -----
 src/amqp_queue.h                         | 2 +-
 tests/auto/qamqpqueue/tst_qamqpqueue.cpp | 4 ++--
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/amqp_queue.cpp b/src/amqp_queue.cpp
index d9f1687..a4c563a 100644
--- a/src/amqp_queue.cpp
+++ b/src/amqp_queue.cpp
@@ -302,11 +302,6 @@ void Queue::declare(int options)
     d->declare();
 }
 
-void Queue::forceRemove()
-{
-    remove(0);
-}
-
 void Queue::remove(int options)
 {
     Q_D(Queue);
diff --git a/src/amqp_queue.h b/src/amqp_queue.h
index efdff5c..206712d 100644
--- a/src/amqp_queue.h
+++ b/src/amqp_queue.h
@@ -46,6 +46,7 @@ public:
     Q_DECLARE_FLAGS(ConsumeOptions, ConsumeOption)
 
     enum RemoveOption {
+        roForce = 0x0,
         roIfUnused = 0x1,
         roIfEmpty = 0x02,
         roNoWait = 0x04
@@ -68,7 +69,6 @@ public:
     void unbind(Exchange *exchange, const QString &key);
     void purge();
     void remove(int options = roIfUnused|roIfEmpty|roNoWait);
-    void forceRemove();
 
     // AMQP Basic
     void consume(int options = NoOptions);
diff --git a/tests/auto/qamqpqueue/tst_qamqpqueue.cpp b/tests/auto/qamqpqueue/tst_qamqpqueue.cpp
index 3e1203f..551a68e 100644
--- a/tests/auto/qamqpqueue/tst_qamqpqueue.cpp
+++ b/tests/auto/qamqpqueue/tst_qamqpqueue.cpp
@@ -194,7 +194,7 @@ void tst_QAMQPQueue::removeIfEmpty()
     }
 
     // clean up queue
-    queue->forceRemove();
+    queue->remove(Queue::roForce);
     QVERIFY(waitForSignal(queue, SIGNAL(removed())));
 }
 
@@ -244,7 +244,7 @@ void tst_QAMQPQueue::purge()
     }
 
     // clean up queue
-    queue->forceRemove();
+    queue->remove(Queue::roForce);
     QVERIFY(waitForSignal(queue, SIGNAL(removed())));
 }