From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Thu, 23 Oct 2014 21:48:57 +0000 (+0200)
Subject: Merge pull request #96 from TheOneRing/qca_qt5
X-Git-Tag: 0.12-beta1~56
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=90803b4288736e6c53d50eeb4fbbe2525be968c3;hp=8b5ecd226f9208af3074b33d3b7cf5e14f55b138

Merge pull request #96 from TheOneRing/qca_qt5

make quassel compile with qca enabled on qt5
---

diff --git a/src/core/cipher.cpp b/src/core/cipher.cpp
index 7d1fe46a..a8232a3c 100644
--- a/src/core/cipher.cpp
+++ b/src/core/cipher.cpp
@@ -429,13 +429,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;
         }
     }