From c05ade838f0fce81f2bbe80a3295618a8a26ff52 Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Fri, 2 Aug 2019 19:59:40 +0900
Subject: Apply the new brace wrapping to source files

---
 lib/events/encryptionevent.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'lib/events/encryptionevent.cpp')

diff --git a/lib/events/encryptionevent.cpp b/lib/events/encryptionevent.cpp
index 995c8dad..0c732a51 100644
--- a/lib/events/encryptionevent.cpp
+++ b/lib/events/encryptionevent.cpp
@@ -15,11 +15,9 @@ static const std::array<QString, 1> encryptionStrings = {
     { QMatrixClient::MegolmV1AesSha2AlgoKey }
 };
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
 template <>
-struct JsonConverter<EncryptionType>
-{
+struct JsonConverter<EncryptionType> {
     static EncryptionType load(const QJsonValue& jv)
     {
         const auto& encryptionString = jv.toString();
-- 
cgit v1.2.3


From 27ca32a1e5a56e09b9cc1d94224d2831004dcf3d Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Sun, 7 Jul 2019 19:32:34 +0900
Subject: Namespace: QMatrixClient -> Quotient (with back comp alias)

---
 lib/events/encryptionevent.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib/events/encryptionevent.cpp')

diff --git a/lib/events/encryptionevent.cpp b/lib/events/encryptionevent.cpp
index 0c732a51..945e6696 100644
--- a/lib/events/encryptionevent.cpp
+++ b/lib/events/encryptionevent.cpp
@@ -12,10 +12,10 @@
 #include <array>
 
 static const std::array<QString, 1> encryptionStrings = {
-    { QMatrixClient::MegolmV1AesSha2AlgoKey }
+    { Quotient::MegolmV1AesSha2AlgoKey }
 };
 
-namespace QMatrixClient {
+namespace Quotient {
 template <>
 struct JsonConverter<EncryptionType> {
     static EncryptionType load(const QJsonValue& jv)
@@ -32,7 +32,7 @@ struct JsonConverter<EncryptionType> {
 };
 } // namespace QMatrixClient
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 EncryptionEventContent::EncryptionEventContent(const QJsonObject& json)
     : encryption(fromJson<EncryptionType>(json["algorithm"_ls]))
-- 
cgit v1.2.3


From 0c425aedbf3729941e40b1606a7c54169b84cf97 Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Sun, 11 Aug 2019 09:31:59 +0900
Subject: Cleanup

[skip ci]
---
 lib/events/encryptionevent.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/events/encryptionevent.cpp')

diff --git a/lib/events/encryptionevent.cpp b/lib/events/encryptionevent.cpp
index 945e6696..073303b0 100644
--- a/lib/events/encryptionevent.cpp
+++ b/lib/events/encryptionevent.cpp
@@ -30,7 +30,7 @@ struct JsonConverter<EncryptionType> {
         return EncryptionType::Undefined;
     }
 };
-} // namespace QMatrixClient
+} // namespace Quotient
 
 using namespace Quotient;
 
-- 
cgit v1.2.3