Misc. cleanup.

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

3 files changed, 27 insertions, 23 deletions

diff --git a/cpp/src/qpid/io/SessionContext.h b/cpp/src/qpid/io/SessionContext.h
index b8fa8de62e..c9a2ce49f2 100644
--- a/cpp/src/qpid/io/SessionContext.h
+++ b/cpp/src/qpid/io/SessionContext.h
@@ -23,15 +23,16 @@
 namespace qpid {
 namespace io {
 
-    class SessionContext : public virtual qpid::framing::OutputHandler 
-    {
-    public:
-        virtual void close() = 0;
-	virtual ~SessionContext(){}
-    };
+/**
+ * Provides the output handler associated with a connection.
+ */
+class SessionContext : public virtual qpid::framing::OutputHandler 
+{
+  public:
+    virtual void close() = 0;
+};
 
-}
-}
+}}
 
 
 #endif
diff --git a/cpp/src/qpid/io/SessionHandler.h b/cpp/src/qpid/io/SessionHandler.h
index 5b4e60213b..ac455122d6 100644
--- a/cpp/src/qpid/io/SessionHandler.h
+++ b/cpp/src/qpid/io/SessionHandler.h
@@ -26,13 +26,13 @@
 namespace qpid {
 namespace io {
 
-    class SessionHandler : public virtual qpid::framing::InitiationHandler,
-        public virtual qpid::framing::InputHandler, 
-        public virtual TimeoutHandler
+    class SessionHandler :
+        public qpid::framing::InitiationHandler,
+        public qpid::framing::InputHandler, 
+        public TimeoutHandler
     {
     public:
         virtual void closed() = 0;
-	virtual ~SessionHandler(){}
     };
 
 }
diff --git a/cpp/src/qpid/io/SessionHandlerFactory.h b/cpp/src/qpid/io/SessionHandlerFactory.h
index 8ed2dffe57..441b8e9fd6 100644
--- a/cpp/src/qpid/io/SessionHandlerFactory.h
+++ b/cpp/src/qpid/io/SessionHandlerFactory.h
@@ -18,21 +18,24 @@
 #ifndef _SessionHandlerFactory_
 #define _SessionHandlerFactory_
 
-#include "qpid/io/SessionContext.h"
-#include "qpid/io/SessionHandler.h"
-
 namespace qpid {
 namespace io {
 
-    class SessionHandlerFactory
-    {
-    public:
-        virtual SessionHandler* create(SessionContext* ctxt) = 0;
-	virtual ~SessionHandlerFactory(){}
-    };
+class SessionContext;
+class SessionHandler;
+
+/**
+ * Callback interface used by the Acceptor to
+ * create a SessionHandler for each new connection.
+ */
+class SessionHandlerFactory : private boost::noncopyable
+{
+  public:
+    virtual SessionHandler* create(SessionContext* ctxt) = 0;
+    virtual ~SessionHandlerFactory(){}
+};
 
-}
-}
+}}
 
 
 #endif