summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
00b029d)
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.
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()) {
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())));
}
*
* @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.