From 97f2d162618e7fb2473c184c77875ac9d5e8d1d5 Mon Sep 17 00:00:00 2001
From: Carl Schwan <carl@carlschwan.eu>
Date: Mon, 15 Feb 2021 18:10:34 +0100
Subject: Apply a few more comments

---
 autotests/testolmaccount.cpp | 4 ++--
 autotests/testolmaccount.h   | 2 +-
 lib/encryptionmanager.cpp    | 2 +-
 lib/room.cpp                 | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/autotests/testolmaccount.cpp b/autotests/testolmaccount.cpp
index 4eed1980..8129ae5b 100644
--- a/autotests/testolmaccount.cpp
+++ b/autotests/testolmaccount.cpp
@@ -9,7 +9,7 @@
 
 using namespace Quotient;
 
-void TestOlmAccount::pickleUnpickedTest()
+void TestOlmAccount::pickleUnpickledTest()
 {
     QOlmAccount olmAccount(QStringLiteral("@foo:bar.com"), QStringLiteral("QuotientTestDevice"));
     olmAccount.createNewAccount();
@@ -73,7 +73,7 @@ void TestOlmAccount::deviceKeys()
 {
     // copied from mtxclient
     DeviceKeys device1;
-    device1.userId   = "@alice:example.com";
+    device1.userId = "@alice:example.com";
     device1.deviceId = "JLAFKJWSCS";
     device1.keys = {{"curve25519:JLAFKJWSCS", "3C5BFWi2Y8MaVvjM8M22DBmh24PmgR0nPvJOIArzgyI"},
                     {"ed25519:JLAFKJWSCS", "lEuiRJBit0IG6nUf5pUzWTUEsRVVe/HJkoKuEww9ULI"}};
diff --git a/autotests/testolmaccount.h b/autotests/testolmaccount.h
index b6b9cae4..97fbca18 100644
--- a/autotests/testolmaccount.h
+++ b/autotests/testolmaccount.h
@@ -15,7 +15,7 @@ class TestOlmAccount : public QObject
 
 
 private Q_SLOTS:
-    void pickleUnpickedTest();
+    void pickleUnpickledTest();
     void identityKeysValid();
     void signatureValid();
     void oneTimeKeysValid();
diff --git a/lib/encryptionmanager.cpp b/lib/encryptionmanager.cpp
index 719add1d..3c3103a7 100644
--- a/lib/encryptionmanager.cpp
+++ b/lib/encryptionmanager.cpp
@@ -69,7 +69,7 @@ public:
     UploadKeysJob* uploadOneTimeKeysJob = nullptr;
     QueryKeysJob* queryKeysJob = nullptr;
 
-    QScopedPointer<QOlmAccount> olmAccount;
+    std::unique_ptr<QOlmAccount> olmAccount;
 
     float signedKeysProportion;
     float oneTimeKeyThreshold;
diff --git a/lib/room.cpp b/lib/room.cpp
index a8a7fe0c..1a7a9911 100644
--- a/lib/room.cpp
+++ b/lib/room.cpp
@@ -66,8 +66,8 @@
 
 #ifdef Quotient_E2EE_ENABLED
 #include "crypto/qolmaccount.h"
-#    include "crypto/qolmerrors.h"
-#    include "crypto/qolminboundsession.h"
+#include "crypto/qolmerrors.h"
+#include "crypto/qolminboundsession.h"
 #endif // Quotient_E2EE_ENABLED
 
 using namespace Quotient;
-- 
cgit v1.2.3