projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
client: Fix backlog requests with 0 initial fetch
[quassel.git]
/
src
/
core
/
coreircuser.cpp
diff --git
a/src/core/coreircuser.cpp
b/src/core/coreircuser.cpp
index
4dd946e
..
55a5941
100644
(file)
--- a/
src/core/coreircuser.cpp
+++ b/
src/core/coreircuser.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-20
18
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 *
@@
-19,15
+19,17
@@
***************************************************************************/
#include "coreircuser.h"
***************************************************************************/
#include "coreircuser.h"
+
#include "corenetwork.h"
#include "corenetwork.h"
-CoreIrcUser::CoreIrcUser(const QString &hostmask, Network *network) : IrcUser(hostmask, network)
+CoreIrcUser::CoreIrcUser(const QString& hostmask, Network* network)
+ : IrcUser(hostmask, network)
{
#ifdef HAVE_QCA2
{
#ifdef HAVE_QCA2
- _cipher =
0
;
+ _cipher =
nullptr
;
// Get the cipher key from CoreNetwork if present
// Get the cipher key from CoreNetwork if present
-
CoreNetwork *coreNetwork = qobject_cast<CoreNetwork
*>(network);
+
auto* coreNetwork = qobject_cast<CoreNetwork
*>(network);
if (coreNetwork) {
QByteArray key = coreNetwork->readChannelCipherKey(nick().toLower());
if (!key.isEmpty()) {
if (coreNetwork) {
QByteArray key = coreNetwork->readChannelCipherKey(nick().toLower());
if (!key.isEmpty()) {
@@
-40,7
+42,6
@@
CoreIrcUser::CoreIrcUser(const QString &hostmask, Network *network) : IrcUser(ho
#endif
}
#endif
}
-
CoreIrcUser::~CoreIrcUser()
{
#ifdef HAVE_QCA2
CoreIrcUser::~CoreIrcUser()
{
#ifdef HAVE_QCA2
@@
-48,7
+49,7
@@
CoreIrcUser::~CoreIrcUser()
// exists. There is no need to store the empty key if no cipher exists; no
// key was present when instantiating and no key was set during the
// channel's lifetime.
// exists. There is no need to store the empty key if no cipher exists; no
// key was present when instantiating and no key was set during the
// channel's lifetime.
-
CoreNetwork *coreNetwork = qobject_cast<CoreNetwork
*>(network());
+
auto* coreNetwork = qobject_cast<CoreNetwork
*>(network());
if (coreNetwork && _cipher) {
coreNetwork->storeChannelCipherKey(nick().toLower(), _cipher->key());
}
if (coreNetwork && _cipher) {
coreNetwork->storeChannelCipherKey(nick().toLower(), _cipher->key());
}
@@
-57,9
+58,8
@@
CoreIrcUser::~CoreIrcUser()
#endif
}
#endif
}
-
#ifdef HAVE_QCA2
#ifdef HAVE_QCA2
-Cipher
*
CoreIrcUser::cipher() const
+Cipher
*
CoreIrcUser::cipher() const
{
if (!_cipher)
_cipher = new Cipher();
{
if (!_cipher)
_cipher = new Cipher();
@@
-67,5
+67,4
@@
Cipher *CoreIrcUser::cipher() const
return _cipher;
}
return _cipher;
}
-
#endif
#endif