2 files changed, 9 insertions, 1 deletions
diff --git a/qpid/cpp/include/qmf/Connection.h b/qpid/cpp/include/qmf/Connection.h
index b910cdad19..f648b1427f 100644
--- a/qpid/cpp/include/qmf/Connection.h
+++ b/qpid/cpp/include/qmf/Connection.h
@@ -47,6 +47,8 @@ namespace qmf {
 
         /**
          * Called each time the state of the connection changes.
+         *
+         * @param state the new state
          */
         virtual void newState(ConnectionState state);
 
diff --git a/qpid/cpp/include/qmf/ConnectionSettings.h b/qpid/cpp/include/qmf/ConnectionSettings.h
index 53a83dfd2a..9bd6922a56 100644
--- a/qpid/cpp/include/qmf/ConnectionSettings.h
+++ b/qpid/cpp/include/qmf/ConnectionSettings.h
@@ -21,6 +21,7 @@
  */
 
 #include "qmf/QmfImportExport.h"
+#include "qpid/sys/IntegerTypes.h"
 
 namespace qmf {
 
@@ -35,6 +36,8 @@ namespace qmf {
     class ConnectionSettings {
     public:
 
+        ConnectionSettings(const ConnectionSettings& copy);
+
         /**
          * Create a set of default connection settings.
          *
@@ -79,8 +82,10 @@ namespace qmf {
          * Get the value of an attribute.
          *
          * @param key A null-terminated attribute name.
+         *
+         * @return The value associated with the attribute name.
          */
-        QMF_EXTERN const Value& getAttr(const char* key) const;
+        QMF_EXTERN Value getAttr(const char* key) const;
 
         /**
          * Get the attribute string (the portion of the URL following the '?') for the settings.
@@ -129,6 +134,7 @@ namespace qmf {
         QMF_EXTERN void setRetry(int delayMin = 1, int delayMax = 128, int delayFactor = 2);
 
     private:
+        friend class ResilientConnectionImpl;
         ConnectionSettingsImpl* impl;
     };