core: Clarify name of capsPendingNegotiation flag

Rename "capNegotiationInProgress()" to "capsPendingNegotiation()"
to better clarify the meaning of the function.  This checks if any
capabilities are queued for an ongoing negotiation; it does not
represent whether or not "CAP LS" has been sent.

diff --git a/src/core/corenetwork.cpp b/src/core/corenetwork.cpp
index 8dccbd5..0dfb33b 100644 (file)
--- a/src/core/corenetwork.cpp
+++ b/src/core/corenetwork.cpp
@@ -1267,7 +1267,7 @@ void CoreNetwork::retryCapsIndividually()
 
 void CoreNetwork::beginCapNegotiation()
 {
 
 void CoreNetwork::beginCapNegotiation()
 {

-    if (!capNegotiationInProgress()) {
+    if (!capsPendingNegotiation()) {

         // No capabilities are queued for request, determine the reason why
         QString capStatusMsg;
         if (caps().empty()) {
         // No capabilities are queued for request, determine the reason why
         QString capStatusMsg;
         if (caps().empty()) {


@@ -1327,7 +1327,7 @@ void CoreNetwork::beginCapNegotiation()
 
 void CoreNetwork::sendNextCap()
 {
 
 void CoreNetwork::sendNextCap()
 {

-    if (capNegotiationInProgress()) {
+    if (capsPendingNegotiation()) {

         // Request the next set of capabilities and remove them from the list
         putRawLine(serverEncode(QString("CAP REQ :%1").arg(takeQueuedCaps())));
     }
         // Request the next set of capabilities and remove them from the list
         putRawLine(serverEncode(QString("CAP REQ :%1").arg(takeQueuedCaps())));
     }

diff --git a/src/core/corenetwork.h b/src/core/corenetwork.h
index 2bd3451..510b5fb 100644 (file)
--- a/src/core/corenetwork.h
+++ b/src/core/corenetwork.h
@@ -141,7 +141,7 @@ public:
      *
      * @returns True if in progress, otherwise false
      */
      *
      * @returns True if in progress, otherwise false
      */

-    inline bool capNegotiationInProgress() const { return (!_capsQueuedIndividual.empty() || !_capsQueuedBundled.empty()); }
+    inline bool capsPendingNegotiation() const { return (!_capsQueuedIndividual.empty() || !_capsQueuedBundled.empty()); }

 
     /**
      * Queues a capability to be requested.
 
     /**
      * Queues a capability to be requested.