X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcipher.cpp;h=fb6a69720668f7acd905e88e3989092046a91d8a;hb=4cf9c160f318a71400b032ea6d3031b9e6628a56;hp=7d1fe46a5e7be506d06310e188404bab8c8b8253;hpb=8b5ecd226f9208af3074b33d3b7cf5e14f55b138;p=quassel.git

diff --git a/src/core/cipher.cpp b/src/core/cipher.cpp
index 7d1fe46a..fb6a6972 100644
--- a/src/core/cipher.cpp
+++ b/src/core/cipher.cpp
@@ -13,7 +13,7 @@
 */
 
 #include "cipher.h"
-#include "logger.h"
+#include "logmessage.h"
 
 Cipher::Cipher()
 {
@@ -117,7 +117,6 @@ QByteArray Cipher::decrypt(QByteArray cipherText)
     // (if cbc and no error we parse cbc) || (if ecb and error we parse cbc)
     if ((m_cbc && !error) || (!m_cbc && error))
     {
-        cipherText = cipherText;
         temp = blowfishCBC(cipherText, false);
 
         if (temp == cipherText)
@@ -429,13 +428,13 @@ QByteArray Cipher::byteToB64(QByteArray text)
         right += v;
 
         for (int i = 0; i < 6; i++) {
-            encoded.append(base64.at(right & 0x3F).toAscii());
+            encoded.append(base64.at(right & 0x3F).toLatin1());
             right = right >> 6;
         }
 
-        //TODO make sure the .toascii doesn't break anything
+        //TODO make sure the .toLatin1 doesn't break anything
         for (int i = 0; i < 6; i++) {
-            encoded.append(base64.at(left & 0x3F).toAscii());
+            encoded.append(base64.at(left & 0x3F).toLatin1());
             left = left >> 6;
         }
     }