QPID-664: changed pending to unsettled; added available to sender; minor update to address doc

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

6 files changed, 32 insertions, 32 deletions

diff --git a/cpp/src/qpid/client/amqp0_10/ReceiverImpl.cpp b/cpp/src/qpid/client/amqp0_10/ReceiverImpl.cpp
index 343b5cad37..b86f142546 100644
--- a/cpp/src/qpid/client/amqp0_10/ReceiverImpl.cpp
+++ b/cpp/src/qpid/client/amqp0_10/ReceiverImpl.cpp
@@ -130,14 +130,14 @@ uint32_t ReceiverImpl::getCapacity()
     return capacity;
 }
 
-uint32_t ReceiverImpl::available()
+uint32_t ReceiverImpl::getAvailable()
 {
-    return parent->available(destination);
+    return parent->getReceivable(destination);
 }
 
-uint32_t ReceiverImpl::pendingAck()
+uint32_t ReceiverImpl::getUnsettled()
 {
-    return parent->pendingAck(destination);
+    return parent->getUnsettledAcks(destination);
 }
 
 ReceiverImpl::ReceiverImpl(SessionImpl& p, const std::string& name, 
diff --git a/cpp/src/qpid/client/amqp0_10/ReceiverImpl.h b/cpp/src/qpid/client/amqp0_10/ReceiverImpl.h
index d509490688..e6d11e4bb5 100644
--- a/cpp/src/qpid/client/amqp0_10/ReceiverImpl.h
+++ b/cpp/src/qpid/client/amqp0_10/ReceiverImpl.h
@@ -60,8 +60,8 @@ class ReceiverImpl : public qpid::messaging::ReceiverImpl
     const std::string& getName() const;
     void setCapacity(uint32_t);
     uint32_t getCapacity();
-    uint32_t available();
-    uint32_t pendingAck();
+    uint32_t getAvailable();
+    uint32_t getUnsettled();
     void received(qpid::messaging::Message& message);
     qpid::messaging::Session getSession() const;
   private:
diff --git a/cpp/src/qpid/client/amqp0_10/SenderImpl.cpp b/cpp/src/qpid/client/amqp0_10/SenderImpl.cpp
index 522c93a552..4c41622751 100644
--- a/cpp/src/qpid/client/amqp0_10/SenderImpl.cpp
+++ b/cpp/src/qpid/client/amqp0_10/SenderImpl.cpp
@@ -58,7 +58,7 @@ void SenderImpl::setCapacity(uint32_t c)
     execute1<CheckPendingSends>(flush);
 }
 uint32_t SenderImpl::getCapacity() { return capacity; }
-uint32_t SenderImpl::pending()
+uint32_t SenderImpl::getUnsettled()
 {
     CheckPendingSends f(*this, false);
     parent->execute(f);
diff --git a/cpp/src/qpid/client/amqp0_10/SenderImpl.h b/cpp/src/qpid/client/amqp0_10/SenderImpl.h
index 7ea68fd187..826c734697 100644
--- a/cpp/src/qpid/client/amqp0_10/SenderImpl.h
+++ b/cpp/src/qpid/client/amqp0_10/SenderImpl.h
@@ -52,7 +52,7 @@ class SenderImpl : public qpid::messaging::SenderImpl
     void close();
     void setCapacity(uint32_t);
     uint32_t getCapacity();
-    uint32_t pending();
+    uint32_t getUnsettled();
     void init(qpid::client::AsyncSession, AddressResolution&);
     const std::string& getName() const;
     qpid::messaging::Session getSession() const;
diff --git a/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp b/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp
index 33a3e226ff..15a936465b 100644
--- a/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp
+++ b/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp
@@ -341,25 +341,25 @@ qpid::messaging::Receiver SessionImpl::nextReceiver(qpid::messaging::Duration ti
     return receiver;
 }
 
-uint32_t SessionImpl::available()
+uint32_t SessionImpl::getReceivable()
 {
-    return get1<Available, uint32_t>((const std::string*) 0);
+    return get1<Receivable, uint32_t>((const std::string*) 0);
 }
-uint32_t SessionImpl::available(const std::string& destination)
+uint32_t SessionImpl::getReceivable(const std::string& destination)
 {
-    return get1<Available, uint32_t>(&destination);
+    return get1<Receivable, uint32_t>(&destination);
 }
 
-struct SessionImpl::Available : Command
+struct SessionImpl::Receivable : Command
 {
     const std::string* destination;
     uint32_t result;
     
-    Available(SessionImpl& i, const std::string* d) : Command(i), destination(d), result(0) {}
-    void operator()() { result = impl.availableImpl(destination); }
+    Receivable(SessionImpl& i, const std::string* d) : Command(i), destination(d), result(0) {}
+    void operator()() { result = impl.getReceivableImpl(destination); }
 };
 
-uint32_t SessionImpl::availableImpl(const std::string* destination)
+uint32_t SessionImpl::getReceivableImpl(const std::string* destination)
 {
     if (destination) {
         return incoming.available(*destination);
@@ -368,26 +368,26 @@ uint32_t SessionImpl::availableImpl(const std::string* destination)
     }
 }
 
-uint32_t SessionImpl::pendingAck()
+uint32_t SessionImpl::getUnsettledAcks()
 {
-    return get1<PendingAck, uint32_t>((const std::string*) 0);
+    return get1<UnsettledAcks, uint32_t>((const std::string*) 0);
 }
 
-uint32_t SessionImpl::pendingAck(const std::string& destination)
+uint32_t SessionImpl::getUnsettledAcks(const std::string& destination)
 {
-    return get1<PendingAck, uint32_t>(&destination);
+    return get1<UnsettledAcks, uint32_t>(&destination);
 }
 
-struct SessionImpl::PendingAck : Command
+struct SessionImpl::UnsettledAcks : Command
 {
     const std::string* destination;
     uint32_t result;
     
-    PendingAck(SessionImpl& i, const std::string* d) : Command(i), destination(d), result(0) {}
-    void operator()() { result = impl.pendingAckImpl(destination); }
+    UnsettledAcks(SessionImpl& i, const std::string* d) : Command(i), destination(d), result(0) {}
+    void operator()() { result = impl.getUnsettledAcksImpl(destination); }
 };
 
-uint32_t SessionImpl::pendingAckImpl(const std::string* destination)
+uint32_t SessionImpl::getUnsettledAcksImpl(const std::string* destination)
 {
     if (destination) {
         return incoming.pendingAccept(*destination);
diff --git a/cpp/src/qpid/client/amqp0_10/SessionImpl.h b/cpp/src/qpid/client/amqp0_10/SessionImpl.h
index e1229055f7..0613074f7c 100644
--- a/cpp/src/qpid/client/amqp0_10/SessionImpl.h
+++ b/cpp/src/qpid/client/amqp0_10/SessionImpl.h
@@ -82,11 +82,11 @@ class SessionImpl : public qpid::messaging::SessionImpl
     void receiverCancelled(const std::string& name);
     void senderCancelled(const std::string& name);
 
-    uint32_t available();
-    uint32_t available(const std::string& destination);
+    uint32_t getReceivable();
+    uint32_t getReceivable(const std::string& destination);
 
-    uint32_t pendingAck();
-    uint32_t pendingAck(const std::string& destination);
+    uint32_t getUnsettledAcks();
+    uint32_t getUnsettledAcks(const std::string& destination);
 
     void setSession(qpid::client::Session);
 
@@ -143,8 +143,8 @@ class SessionImpl : public qpid::messaging::SessionImpl
     void syncImpl(bool block);
     qpid::messaging::Sender createSenderImpl(const qpid::messaging::Address& address);
     qpid::messaging::Receiver createReceiverImpl(const qpid::messaging::Address& address);
-    uint32_t availableImpl(const std::string* destination);
-    uint32_t pendingAckImpl(const std::string* destination);
+    uint32_t getReceivableImpl(const std::string* destination);
+    uint32_t getUnsettledAcksImpl(const std::string* destination);
 
     //functors for public facing methods (allows locking and retry
     //logic to be centralised)
@@ -203,8 +203,8 @@ class SessionImpl : public qpid::messaging::SessionImpl
     
     struct CreateSender;
     struct CreateReceiver;
-    struct PendingAck;
-    struct Available;
+    struct UnsettledAcks;
+    struct Receivable;
 
     //helper templates for some common patterns
     template <class F> bool execute()