Removed the Connection classes, added the new SslTransceiver hierarchy,

    cleaned up a lot of code.

1 files changed, 8 insertions, 13 deletions

diff --git a/cpp/src/IceSSL/ContextOpenSSLClient.h b/cpp/src/IceSSL/ContextOpenSSLClient.h
index a42a4116b2a..3a9921a92e6 100644
--- a/cpp/src/IceSSL/ContextOpenSSLClient.h
+++ b/cpp/src/IceSSL/ContextOpenSSLClient.h
@@ -8,37 +8,32 @@
 //
 // **********************************************************************
 
-#ifndef ICE_SSL_CONTEXT_OPENSSL_CLIENT_H
-#define ICE_SSL_CONTEXT_OPENSSL_CLIENT_H
+#ifndef ICESSL_CLIENT_CONTEXT_H
+#define ICESSL_CLIENT_CONTEXT_H
 
 #include <IceSSL/ContextOpenSSL.h>
 
 namespace IceSSL
 {
 
-namespace OpenSSL
-{
-
 class ClientContext : public Context
 {
 public:
 
-    virtual void configure(const IceSSL::GeneralConfig&,
-                           const IceSSL::CertificateAuthority&,
-                           const IceSSL::BaseCertificates&);
+    virtual void configure(const GeneralConfig&,
+                           const CertificateAuthority&,
+                           const BaseCertificates&);
 
     // Takes a socket fd as the first parameter.
-    virtual IceSSL::ConnectionPtr createConnection(int, const IceSSL::PluginBaseIPtr&);
+    virtual SslTransceiverPtr createTransceiver(int, const PluginBaseIPtr&);
 
 protected:
 
-    ClientContext(const IceSSL::TraceLevelsPtr&, const Ice::LoggerPtr&, const Ice::PropertiesPtr&);
+    ClientContext(const TraceLevelsPtr&, const Ice::LoggerPtr&, const Ice::PropertiesPtr&);
 
-    friend class IceSSL::OpenSSL::PluginI;
+    friend class OpenSSL::PluginI;
 };
 
 }
 
-}
-
 #endif