8 files changed, 16 insertions, 15 deletions
diff --git a/lib/converters.cpp b/lib/converters.cpp
index 4136940f..6cbb554d 100644
--- a/lib/converters.cpp
+++ b/lib/converters.cpp
@@ -3,7 +3,7 @@
 
 #include "converters.h"
 
-#include <QVariant>
+#include <QtCore/QVariant>
 #include "e2ee/e2ee.h"
 
 QJsonValue Quotient::JsonConverter<QVariant>::dump(const QVariant& v)
diff --git a/lib/e2ee/qolmaccount.cpp b/lib/e2ee/qolmaccount.cpp
index aaf51946..ffb004cc 100644
--- a/lib/e2ee/qolmaccount.cpp
+++ b/lib/e2ee/qolmaccount.cpp
@@ -34,7 +34,7 @@ bool operator==(const IdentityKeys& lhs, const IdentityKeys& rhs)
 
 // Convert olm error to enum
 QOlmError lastError(OlmAccount *account) {
-    const std::string error_raw = olm_account_last_error(account);
+    const auto error_raw = olm_account_last_error(account);
 
     return fromString(error_raw);
 }
diff --git a/lib/e2ee/qolmerrors.cpp b/lib/e2ee/qolmerrors.cpp
index 6db1803c..568cf7fe 100644
--- a/lib/e2ee/qolmerrors.cpp
+++ b/lib/e2ee/qolmerrors.cpp
@@ -4,17 +4,18 @@
 
 
 #include "qolmerrors.h"
+#include <cstring>
 
-Quotient::QOlmError Quotient::fromString(const std::string &error_raw) {
-    if (!error_raw.compare("BAD_ACCOUNT_KEY")) {
+Quotient::QOlmError Quotient::fromString(const char* error_raw) {
+    if (!strncmp(error_raw, "BAD_ACCOUNT_KEY", 15)) {
         return QOlmError::BadAccountKey;
-    } else if (!error_raw.compare("BAD_MESSAGE_KEY_ID")) {
+    } else if (!strncmp(error_raw, "BAD_MESSAGE_KEY_ID", 18)) {
         return QOlmError::BadMessageKeyId;
-    } else if (!error_raw.compare("INVALID_BASE64")) {
+    } else if (!strncmp(error_raw, "INVALID_BASE64", 14)) {
         return QOlmError::InvalidBase64;
-    } else if (!error_raw.compare("NOT_ENOUGH_RANDOM")) {
+    } else if (!strncmp(error_raw, "NOT_ENOUGH_RANDOM", 17)) {
         return QOlmError::NotEnoughRandom;
-    } else if (!error_raw.compare("OUTPUT_BUFFER_TOO_SMALL")) {
+    } else if (!strncmp(error_raw, "OUTPUT_BUFFER_TOO_SMALL", 23)) {
         return QOlmError::OutputBufferTooSmall;
     } else {
         return QOlmError::Unknown;
diff --git a/lib/e2ee/qolmerrors.h b/lib/e2ee/qolmerrors.h
index f8390d2a..f2d77851 100644
--- a/lib/e2ee/qolmerrors.h
+++ b/lib/e2ee/qolmerrors.h
@@ -23,6 +23,6 @@ enum QOlmError
     Unknown,
 };
 
-QOlmError fromString(const std::string &error_raw);
+QOlmError fromString(const char* error_raw);
 
 } //namespace Quotient
diff --git a/lib/e2ee/qolminboundsession.cpp b/lib/e2ee/qolminboundsession.cpp
index 9bf56b6c..2c546875 100644
--- a/lib/e2ee/qolminboundsession.cpp
+++ b/lib/e2ee/qolminboundsession.cpp
@@ -8,7 +8,7 @@
 using namespace Quotient;
 
 QOlmError lastError(OlmInboundGroupSession *session) {
-    const std::string error_raw = olm_inbound_group_session_last_error(session);
+    const auto error_raw = olm_inbound_group_session_last_error(session);
 
     return fromString(error_raw);
 }
@@ -27,9 +27,8 @@ QOlmInboundGroupSession::~QOlmInboundGroupSession()
 std::unique_ptr<QOlmInboundGroupSession> QOlmInboundGroupSession::create(const QByteArray &key)
 {
     const auto olmInboundGroupSession = olm_inbound_group_session(new uint8_t[olm_inbound_group_session_size()]);
-    const auto temp = key;
     const auto error = olm_init_inbound_group_session(olmInboundGroupSession,
-            reinterpret_cast<const uint8_t *>(temp.data()), temp.size());
+            reinterpret_cast<const uint8_t *>(key.constData()), key.size());
 
     if (error == olm_error()) {
         throw lastError(olmInboundGroupSession);
diff --git a/lib/e2ee/qolmoutboundsession.cpp b/lib/e2ee/qolmoutboundsession.cpp
index 88e6b2e1..58196412 100644
--- a/lib/e2ee/qolmoutboundsession.cpp
+++ b/lib/e2ee/qolmoutboundsession.cpp
@@ -8,7 +8,7 @@
 using namespace Quotient;
 
 QOlmError lastError(OlmOutboundGroupSession *session) {
-    const std::string error_raw = olm_outbound_group_session_last_error(session);
+    const auto error_raw = olm_outbound_group_session_last_error(session);
 
     return fromString(error_raw);
 }
@@ -21,6 +21,7 @@ QOlmOutboundGroupSession::QOlmOutboundGroupSession(OlmOutboundGroupSession *sess
 QOlmOutboundGroupSession::~QOlmOutboundGroupSession()
 {
     olm_clear_outbound_group_session(m_groupSession);
+    Q_ASSERT(sizeof(m_groupSession) == olm_outbound_group_session_size());
     delete[](reinterpret_cast<uint8_t *>(m_groupSession));
 }
 
diff --git a/lib/e2ee/qolmsession.cpp b/lib/e2ee/qolmsession.cpp
index 69d8b431..575019b3 100644
--- a/lib/e2ee/qolmsession.cpp
+++ b/lib/e2ee/qolmsession.cpp
@@ -11,7 +11,7 @@
 using namespace Quotient;
 
 QOlmError lastError(OlmSession* session) {
-    const std::string error_raw = olm_session_last_error(session);
+    const auto error_raw = olm_session_last_error(session);
 
     return fromString(error_raw);
 }
diff --git a/lib/e2ee/qolmutility.cpp b/lib/e2ee/qolmutility.cpp
index d0684055..13ee695e 100644
--- a/lib/e2ee/qolmutility.cpp
+++ b/lib/e2ee/qolmutility.cpp
@@ -10,7 +10,7 @@ using namespace Quotient;
 
 // Convert olm error to enum
 QOlmError lastError(OlmUtility *utility) {
-    const std::string error_raw = olm_utility_last_error(utility);
+    const auto error_raw = olm_utility_last_error(utility);
 
     return fromString(error_raw);
 }