2 files changed, 0 insertions, 29 deletions
diff --git a/qpid/cpp/src/qpid/client/QueueOptions.cpp b/qpid/cpp/src/qpid/client/QueueOptions.cpp
index e589bd76cd..f7705afeb0 100644
--- a/qpid/cpp/src/qpid/client/QueueOptions.cpp
+++ b/qpid/cpp/src/qpid/client/QueueOptions.cpp
@@ -40,8 +40,6 @@ const std::string QueueOptions::strRING_STRICT("ring_strict");
 const std::string QueueOptions::strLastValueQueue("qpid.last_value_queue");
 const std::string QueueOptions::strLVQMatchProperty("qpid.LVQ_key");
 const std::string QueueOptions::strLastValueQueueNoBrowse("qpid.last_value_queue_no_browse");
-const std::string QueueOptions::strQueueEventMode("qpid.queue_event_generation");
-
 
 QueueOptions::~QueueOptions()
 {}
@@ -101,11 +99,6 @@ void QueueOptions::clearOrdering()
     erase(strLastValueQueue);
 }
 
-void QueueOptions::enableQueueEvents(bool enqueueOnly)
-{
-    setInt(strQueueEventMode, enqueueOnly ? ENQUEUE_ONLY : ENQUEUE_AND_DEQUEUE);
-}
-
 }
 }
 
diff --git a/qpid/cpp/src/qpid/client/QueueOptions.h b/qpid/cpp/src/qpid/client/QueueOptions.h
index a2f30a50b5..f7ace15ff9 100644
--- a/qpid/cpp/src/qpid/client/QueueOptions.h
+++ b/qpid/cpp/src/qpid/client/QueueOptions.h
@@ -75,28 +75,6 @@ class QPID_CLIENT_CLASS_EXTERN QueueOptions: public framing::FieldTable
      */
     QPID_CLIENT_EXTERN void clearOrdering();
 
-    /**
-     * Turns on event generation for this queue (either enqueue only
-     * or for enqueue and dequeue events); the events can then be
-     * processed by a regsitered broker plugin.
-     *
-     * DEPRECATED
-     *
-     * This is confusing to anyone who sees only the function call
-     * and not the variable name / doxygen. Consider the following call:
-     *
-     * options.enableQueueEvents(false);
-     *
-     * It looks like it disables queue events, but what it really does is
-     * enable both enqueue and dequeue events.
-     *
-     * Use setInt() instead:
-     *
-     * options.setInt("qpid.queue_event_generation", 2);
-     */
-
-    QPID_CLIENT_EXTERN void enableQueueEvents(bool enqueueOnly);
-
     static QPID_CLIENT_EXTERN const std::string strMaxCountKey;
     static QPID_CLIENT_EXTERN const std::string strMaxSizeKey;
     static QPID_CLIENT_EXTERN const std::string strTypeKey;