1 files changed, 6 insertions, 9 deletions
diff --git a/cpp/src/qpid/broker/QueueRegistry.h b/cpp/src/qpid/broker/QueueRegistry.h
index 6fc90a5527..653a27b1d8 100644
--- a/cpp/src/qpid/broker/QueueRegistry.h
+++ b/cpp/src/qpid/broker/QueueRegistry.h
@@ -24,7 +24,7 @@
 #include <map>
 #include "qpid/sys/Mutex.h"
 #include "Queue.h"
-#include "management/ManagementAgent.h"
+#include "qpid/management/Manageable.h"
 
 namespace qpid {
 namespace broker {
@@ -89,22 +89,19 @@ class QueueRegistry{
      * Return the message store used.
      */
     MessageStore* const getStore() const;
-    
+
     /**
-     * Set/Get the ManagementAgent in use.
+     * Register the manageable parent for declared queues
      */
-    void setManagementAgent (ManagementAgent::shared_ptr agent);
-    ManagementAgent::shared_ptr getManagementAgent (void);
-    void setManagementVhost (ManagementObject::shared_ptr vhost);
-
+    void setParent (management::Manageable* _parent) { parent = _parent; }
+    
 private:
     typedef std::map<string, Queue::shared_ptr> QueueMap;
     QueueMap queues;
     qpid::sys::RWlock lock;
     int counter;
     MessageStore* const store;
-    ManagementAgent::shared_ptr  managementAgent;
-    ManagementObject::shared_ptr managementVhost;
+    management::Manageable* parent;
 };