projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: Clarify name of capsPendingNegotiation flag
[quassel.git]
/
src
/
core
/
corenetwork.h
diff --git
a/src/core/corenetwork.h
b/src/core/corenetwork.h
index
bcab1df
..
510b5fb
100644
(file)
--- a/
src/core/corenetwork.h
+++ b/
src/core/corenetwork.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-20
19
by the Quassel Project *
+ * Copyright (C) 2005-20
20
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-141,7
+141,7
@@
public:
*
* @returns True if in progress, otherwise false
*/
*
* @returns True if in progress, otherwise false
*/
- inline bool cap
NegotiationInProgress
() const { return (!_capsQueuedIndividual.empty() || !_capsQueuedBundled.empty()); }
+ inline bool cap
sPendingNegotiation
() const { return (!_capsQueuedIndividual.empty() || !_capsQueuedBundled.empty()); }
/**
* Queues a capability to be requested.
/**
* Queues a capability to be requested.
@@
-521,6
+521,7
@@
private:
qint64 _socketId{0};
CoreUserInputHandler* _userInputHandler;
qint64 _socketId{0};
CoreUserInputHandler* _userInputHandler;
+ MetricsServer* _metricsServer;
QHash<QString, QString> _channelKeys; // stores persistent channels and their passwords, if any
QHash<QString, QString> _channelKeys; // stores persistent channels and their passwords, if any