QPID-4905: Tidy-up remove OutputHandler and directly use FrameHandler

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1491580 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 3 insertions, 3 deletions

diff --git a/cpp/src/qpid/sys/ConnectionOutputHandler.h b/cpp/src/qpid/sys/ConnectionOutputHandler.h
index 74ac8882f0..3b1440d613 100644
--- a/cpp/src/qpid/sys/ConnectionOutputHandler.h
+++ b/cpp/src/qpid/sys/ConnectionOutputHandler.h
@@ -21,7 +21,7 @@
 #ifndef _ConnectionOutputHandler_
 #define _ConnectionOutputHandler_
 
-#include "qpid/framing/OutputHandler.h"
+#include "qpid/framing/FrameHandler.h"
 #include "qpid/sys/OutputControl.h"
 
 namespace qpid {
@@ -30,7 +30,7 @@ namespace sys {
 /**
  * Provides the output handler associated with a connection.
  */
-class ConnectionOutputHandler : public virtual qpid::framing::OutputHandler, public OutputControl
+class ConnectionOutputHandler : public virtual qpid::framing::FrameHandler, public OutputControl
 {
   public:
     virtual void close() = 0;
diff --git a/cpp/src/qpid/sys/ConnectionOutputHandlerPtr.h b/cpp/src/qpid/sys/ConnectionOutputHandlerPtr.h
index 396c340c11..053f47df49 100644
--- a/cpp/src/qpid/sys/ConnectionOutputHandlerPtr.h
+++ b/cpp/src/qpid/sys/ConnectionOutputHandlerPtr.h
@@ -45,7 +45,7 @@ class ConnectionOutputHandlerPtr : public ConnectionOutputHandler
     void abort() { next->abort(); }
     void connectionEstablished() { next->connectionEstablished(); }
     void activateOutput() { next->activateOutput(); }
-    void send(framing::AMQFrame& f) { next->send(f); }
+    void handle(framing::AMQFrame& f) { next->handle(f); }
 
   private:
     ConnectionOutputHandler* next;