modernize: Pass arguments by value and move in constructors

[quassel.git] / src / core / coreircchannel.cpp

diff --git a/src/core/coreircchannel.cpp b/src/core/coreircchannel.cpp
index 85eb333..8bce68f 100644 (file)
--- a/src/core/coreircchannel.cpp
+++ b/src/core/coreircchannel.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2010 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,51 +15,73 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #include "coreircchannel.h"
 #include "corenetwork.h"
 
-INIT_SYNCABLE_OBJECT(CoreIrcChannel)
 CoreIrcChannel::CoreIrcChannel(const QString &channelname, Network *network)
-  : IrcChannel(channelname, network),
+    : IrcChannel(channelname, network),
     _receivedWelcomeMsg(false)
 {
 #ifdef HAVE_QCA2
-  _cipher = 0;
+    _cipher = nullptr;
+
+    // Get the cipher key from CoreNetwork if present
+    CoreNetwork *coreNetwork = qobject_cast<CoreNetwork *>(network);
+    if (coreNetwork) {
+        QByteArray key = coreNetwork->readChannelCipherKey(channelname);
+        if (!key.isEmpty()) {
+            setEncrypted(cipher()->setKey(key));
+        }
+    }
 #endif
 }
 
-CoreIrcChannel::~CoreIrcChannel() {
+
+CoreIrcChannel::~CoreIrcChannel()
+{
 #ifdef HAVE_QCA2
-  delete _cipher;
+    // Store the cipher key in CoreNetwork, including empty keys if a cipher
+    // 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());
+    if (coreNetwork && _cipher) {
+        coreNetwork->storeChannelCipherKey(name(), _cipher->key());
+    }
+
+    delete _cipher;
 #endif
 }
 
+
 #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(e) {
-    if(topic().isEmpty())
-      return;
 
-    QByteArray key = qobject_cast<CoreNetwork *>(network())->cipherKey(name());
-    if(key.isEmpty())
-      return;
+void CoreIrcChannel::setEncrypted(bool e)
+{
+    IrcChannel::setEncrypted(e);
+
+    if (!Cipher::neededFeaturesAvailable())
+        return;
 
-    if(!cipher()->setKey(key))
-      return;
+    if (e) {
+        if (topic().isEmpty())
+            return;
 
-    QByteArray decrypted = cipher()->decryptTopic(topic().toAscii());
-    setTopic(decodeString(decrypted));
-  }
+        QByteArray decrypted = cipher()->decryptTopic(topic().toLatin1());
+        setTopic(decodeString(decrypted));
+    }
 }
 
+
 #endif