From e5e3036d0391c9f1bf29d71b124be85c97c53fef Mon Sep 17 00:00:00 2001
From: Matt Broadstone <mbroadstone@devonit.com>
Date: Fri, 30 May 2014 14:51:44 -0400
Subject: [PATCH] merge Queue::purge and QueuePrivate::purge

---
 src/amqp_queue.cpp | 34 +++++++++++++++++-----------------
 src/amqp_queue_p.h |  1 -
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/amqp_queue.cpp b/src/amqp_queue.cpp
index d004416..248b791 100644
--- a/src/amqp_queue.cpp
+++ b/src/amqp_queue.cpp
@@ -82,7 +82,23 @@ void Queue::remove(bool ifUnused, bool ifEmpty, bool noWait)
 void Queue::purge()
 {
     Q_D(Queue);
-    d->purge();
+
+    if (!d->opened)
+        return;
+
+    Frame::Method frame(Frame::fcQueue, QueuePrivate::miPurge);
+    frame.setChannel(d->number);
+
+    QByteArray arguments;
+    QDataStream out(&arguments, QIODevice::WriteOnly);
+
+    out << qint16(0);   //reserver 1
+    Frame::writeField('s', out, d->name);
+
+    out << qint8(0);    // no-wait
+    frame.setArguments(arguments);
+
+    d->sendFrame(frame);
 }
 
 void Queue::bind(const QString &exchangeName, const QString &key)
@@ -333,22 +349,6 @@ void QueuePrivate::remove(bool ifUnused, bool ifEmpty, bool noWait)
     sendFrame(frame);
 }
 
-void QueuePrivate::purge()
-{
-    if (!opened)
-        return;
-
-    Frame::Method frame(Frame::fcQueue, miPurge);
-    frame.setChannel(number);
-    QByteArray arguments_;
-    QDataStream out(&arguments_, QIODevice::WriteOnly);
-    out << qint16(0); //reserver 1
-    Frame::writeField('s', out, name);
-    out << qint8(0); // no-wait
-    frame.setArguments(arguments_);
-    sendFrame(frame);
-}
-
 void QueuePrivate::bind(const QString &exchangeName, const QString &key)
 {
     if (!opened) {
diff --git a/src/amqp_queue_p.h b/src/amqp_queue_p.h
index 1facf9e..4b38339 100644
--- a/src/amqp_queue_p.h
+++ b/src/amqp_queue_p.h
@@ -25,7 +25,6 @@ public:
 
     void declare();
     void remove(bool ifUnused = true, bool ifEmpty = true, bool noWait = true);
-    void purge();
     void bind(const QString &exchangeName, const QString &key);
     void unbind(const QString &exchangeName, const QString &key);