1 files changed, 6 insertions, 10 deletions
diff --git a/qpid/cpp/src/qpid/broker/ThresholdAlerts.h b/qpid/cpp/src/qpid/broker/ThresholdAlerts.h
index 2b4a46b736..4f985522e2 100644
--- a/qpid/cpp/src/qpid/broker/ThresholdAlerts.h
+++ b/qpid/cpp/src/qpid/broker/ThresholdAlerts.h
@@ -27,15 +27,13 @@
 #include <string>
 
 namespace qpid {
-namespace framing {
-class FieldTable;
-}
 namespace management {
 class ManagementAgent;
 }
 namespace broker {
 
 class Queue;
+struct QueueSettings;
 /**
  * Class to manage generation of QMF alerts when particular thresholds
  * are breached on a queue.
@@ -48,19 +46,17 @@ class ThresholdAlerts : public QueueObserver
                     const uint32_t countThreshold,
                     const uint64_t sizeThreshold,
                     const long repeatInterval);
-    void enqueued(const QueuedMessage&);
-    void dequeued(const QueuedMessage&);
-    void acquired(const QueuedMessage&) {};
-    void requeued(const QueuedMessage&) {};
+    void enqueued(const Message&);
+    void dequeued(const Message&);
+    void acquired(const Message&) {};
+    void requeued(const Message&) {};
 
     static void observe(Queue& queue, qpid::management::ManagementAgent& agent,
                         const uint64_t countThreshold,
                         const uint64_t sizeThreshold,
                         const long repeatInterval);
     static void observe(Queue& queue, qpid::management::ManagementAgent& agent,
-                        const qpid::framing::FieldTable& settings, uint16_t limitRatio);
-    static void observe(Queue& queue, qpid::management::ManagementAgent& agent,
-                        const qpid::types::Variant::Map& settings, uint16_t limitRatio);
+                        const QueueSettings& settings, uint16_t limitRatio);
   private:
     const std::string name;
     qpid::management::ManagementAgent& agent;