projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reformat ALL the source!
[quassel.git]
/
src
/
core
/
coreircchannel.cpp
diff --git
a/src/core/coreircchannel.cpp
b/src/core/coreircchannel.cpp
index
2085510
..
2dd1d9d
100644
(file)
--- a/
src/core/coreircchannel.cpp
+++ b/
src/core/coreircchannel.cpp
@@
-23,46
+23,53
@@
INIT_SYNCABLE_OBJECT(CoreIrcChannel)
CoreIrcChannel::CoreIrcChannel(const QString &channelname, Network *network)
INIT_SYNCABLE_OBJECT(CoreIrcChannel)
CoreIrcChannel::CoreIrcChannel(const QString &channelname, Network *network)
- : IrcChannel(channelname, network),
+
: IrcChannel(channelname, network),
_receivedWelcomeMsg(false)
{
#ifdef HAVE_QCA2
_receivedWelcomeMsg(false)
{
#ifdef HAVE_QCA2
- _cipher = 0;
+
_cipher = 0;
#endif
}
#endif
}
-CoreIrcChannel::~CoreIrcChannel() {
+
+CoreIrcChannel::~CoreIrcChannel()
+{
#ifdef HAVE_QCA2
#ifdef HAVE_QCA2
- delete _cipher;
+
delete _cipher;
#endif
}
#endif
}
+
#ifdef HAVE_QCA2
#ifdef HAVE_QCA2
-Cipher *CoreIrcChannel::cipher() const {
- if(!_cipher)
- _cipher = new Cipher();
+Cipher *CoreIrcChannel::cipher() const
+{
+ if (!_cipher)
+ _cipher = new Cipher();
- return _cipher;
+
return _cipher;
}
}
-void CoreIrcChannel::setEncrypted(bool e) {
- if(!Cipher::neededFeaturesAvailable())
- return;
- if(e) {
- if(topic().isEmpty())
- return;
+void CoreIrcChannel::setEncrypted(bool e)
+{
+ if (!Cipher::neededFeaturesAvailable())
+ return;
+
+ if (e) {
+ if (topic().isEmpty())
+ return;
- QByteArray key = qobject_cast<CoreNetwork *>(network())->cipherKey(name());
-
if
(key.isEmpty())
- return;
+
QByteArray key = qobject_cast<CoreNetwork *>(network())->cipherKey(name());
+
if
(key.isEmpty())
+
return;
-
if
(!cipher()->setKey(key))
- return;
+
if
(!cipher()->setKey(key))
+
return;
- QByteArray decrypted = cipher()->decryptTopic(topic().toAscii());
- setTopic(decodeString(decrypted));
- }
+
QByteArray decrypted = cipher()->decryptTopic(topic().toAscii());
+
setTopic(decodeString(decrypted));
+
}
}
}
+
#endif
#endif