Separate option parsing from qpid::client::ClientSettings.

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

1 files changed, 4 insertions, 16 deletions

diff --git a/cpp/src/qpid/client/ConnectionSettings.h b/cpp/src/qpid/client/ConnectionSettings.h
index d35b8bc0e7..bc3d79e1c6 100644
--- a/cpp/src/qpid/client/ConnectionSettings.h
+++ b/cpp/src/qpid/client/ConnectionSettings.h
@@ -34,12 +34,11 @@ namespace qpid {
 namespace client {
 
 /**
- * Used to hold seetings for a connection (and parse these from
- * command line options etc if desired).
+ * Settings for a Connection.
  */
-struct ConnectionSettings : qpid::Options, qpid::sys::Socket::Configuration {
-    // FIXME aconway 2008-06-02: separate option parsing from settings as subclass.
-    ConnectionSettings(const std::string& argv0=std::string());
+struct ConnectionSettings : public sys::Socket::Configuration {
+
+    ConnectionSettings();
     virtual ~ConnectionSettings();
 
     /**
@@ -47,12 +46,6 @@ struct ConnectionSettings : qpid::Options, qpid::sys::Socket::Configuration {
      */
     virtual void configurePosixTcpSocket(int fd) const;
 
-    /** 
-     * Parse options from command line arguments (will throw exception
-     * if arguments cannot be parsed).
-     */
-    void parse(int argc, char** argv);
-
     /**
      * The host (or ip address) to connect to (defaults to 'localhost').
      */
@@ -110,11 +103,6 @@ struct ConnectionSettings : qpid::Options, qpid::sys::Socket::Configuration {
      * If true, TCP_NODELAY will be set for the connection.
      */
     bool tcpNoDelay;
-
-    /**
-     * Logging settings to use.
-     */
-    log::Options log;
 };
 
 }} // namespace qpid::client