QPID-4905: Removed TimeoutHandler interface as it was really unused

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

2 files changed, 5 insertions, 14 deletions

diff --git a/cpp/src/qpid/client/ConnectionImpl.cpp b/cpp/src/qpid/client/ConnectionImpl.cpp
index dbb0a67d22..056a53f263 100644
--- a/cpp/src/qpid/client/ConnectionImpl.cpp
+++ b/cpp/src/qpid/client/ConnectionImpl.cpp
@@ -149,16 +149,16 @@ IOThread& theIO() {
 }
 
 class HeartbeatTask : public TimerTask {
-    TimeoutHandler& timeout;
+    ConnectionImpl& timeout;
 
     void fire() {
         // If we ever get here then we have timed out
         QPID_LOG(debug, "Traffic timeout");
-        timeout.idleIn();
+        timeout.timeout();
     }
 
 public:
-    HeartbeatTask(Duration p, TimeoutHandler& t) :
+    HeartbeatTask(Duration p, ConnectionImpl& t) :
         TimerTask(p,"Heartbeat"),
         timeout(t)
     {}
@@ -304,17 +304,11 @@ void ConnectionImpl::open()
     }
 }
 
-void ConnectionImpl::idleIn()
+void ConnectionImpl::timeout()
 {
     connector->abort();
 }
 
-void ConnectionImpl::idleOut()
-{
-    AMQFrame frame((AMQHeartbeatBody()));
-    connector->handle(frame);
-}
-
 void ConnectionImpl::close()
 {
     if (heartbeatTask) 
diff --git a/cpp/src/qpid/client/ConnectionImpl.h b/cpp/src/qpid/client/ConnectionImpl.h
index cc81500b18..b07ce142fb 100644
--- a/cpp/src/qpid/client/ConnectionImpl.h
+++ b/cpp/src/qpid/client/ConnectionImpl.h
@@ -28,7 +28,6 @@
 #include "qpid/framing/FrameHandler.h"
 #include "qpid/sys/Mutex.h"
 #include "qpid/sys/ShutdownHandler.h"
-#include "qpid/sys/TimeoutHandler.h"
 
 #include <map>
 #include <iosfwd>
@@ -46,7 +45,6 @@ class SessionImpl;
 
 class ConnectionImpl : public Bounds,
                        public framing::FrameHandler,
-                       public sys::TimeoutHandler, 
                        public sys::ShutdownHandler,
                        public boost::enable_shared_from_this<ConnectionImpl>
 {
@@ -69,8 +67,6 @@ class ConnectionImpl : public Bounds,
 
     void incoming(framing::AMQFrame& frame);
     void closed(uint16_t, const std::string&);
-    void idleOut();
-    void idleIn();
     void shutdown();
     void failedConnection();
     void release();
@@ -90,6 +86,7 @@ class ConnectionImpl : public Bounds,
     void addSession(const boost::shared_ptr<SessionImpl>&, uint16_t channel=NEXT_CHANNEL);
         
     void close();
+    void timeout();
     void handle(framing::AMQFrame& frame);
     void erase(uint16_t channel);
     const ConnectionSettings& getNegotiatedSettings();