Move ConnectionOptions into qpid::client.

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

4 files changed, 9 insertions, 5 deletions

diff --git a/qpid/cpp/src/Makefile.am b/qpid/cpp/src/Makefile.am
index 53b828a709..bb0df2aa2d 100644
--- a/qpid/cpp/src/Makefile.am
+++ b/qpid/cpp/src/Makefile.am
@@ -443,6 +443,7 @@ nobase_include_HEADERS = \
   qpid/client/ConnectionHandler.h \
   qpid/client/ConnectionImpl.h \
   qpid/client/ConnectionSettings.h \
+  qpid/client/ConnectionOptions.h \
   qpid/client/Connector.h \
   qpid/client/ChainableFrameHandler.h	\
   qpid/client/Demux.h \
diff --git a/qpid/cpp/src/tests/ConnectionOptions.h b/qpid/cpp/src/qpid/client/ConnectionOptions.h
index 3be0528612..b997b21494 100644
--- a/qpid/cpp/src/tests/ConnectionOptions.h
+++ b/qpid/cpp/src/qpid/client/ConnectionOptions.h
@@ -22,9 +22,11 @@
  *
  */
 
-#include "ConnectionOptions.h"
 #include "qpid/Options.h"
+#include "qpid/client/ConnectionSettings.h"
 
+namespace qpid {
+namespace client {
 /**
  * Options parser for ConnectionOptions.
  */
@@ -50,4 +52,6 @@ struct  ConnectionOptions : public qpid::Options,
     }
 };
 
+}}
+
 #endif  /*!QPID_CLIENT_CONNECTIONOPTIONS_H*/
diff --git a/qpid/cpp/src/tests/Makefile.am b/qpid/cpp/src/tests/Makefile.am
index 1751d26808..41e7c525cf 100644
--- a/qpid/cpp/src/tests/Makefile.am
+++ b/qpid/cpp/src/tests/Makefile.am
@@ -63,8 +63,7 @@ unit_test_SOURCES= unit_test.cpp unit_test.h \
 	TxAckTest.cpp \
 	TxBufferTest.cpp \
 	TxPublishTest.cpp \
-	MessageBuilderTest.cpp \
-	ConnectionOptions.h
+	MessageBuilderTest.cpp
 
 if HAVE_XML
 unit_test_SOURCES+= XmlClientSessionTest.cpp
diff --git a/qpid/cpp/src/tests/TestOptions.h b/qpid/cpp/src/tests/TestOptions.h
index a400fe5ecb..365db59637 100644
--- a/qpid/cpp/src/tests/TestOptions.h
+++ b/qpid/cpp/src/tests/TestOptions.h
@@ -26,7 +26,7 @@
 #include "qpid/Url.h"
 #include "qpid/log/Logger.h"
 #include "qpid/client/Connection.h"
-#include "ConnectionOptions.h"
+#include "qpid/client/ConnectionOptions.h"
 
 #include <iostream>
 #include <exception>
@@ -69,7 +69,7 @@ struct TestOptions : public qpid::Options
 
     
     bool help;
-    ConnectionOptions con;
+    qpid::client::ConnectionOptions con;
     qpid::log::Options log;
     std::string helpText;
 };