From aacc4bcb4a487871daae6717f77605aaba444341 Mon Sep 17 00:00:00 2001
From: Marc Deop <marc@marcdeop.com>
Date: Sat, 2 Mar 2019 12:26:57 +0100
Subject: style: apply .clang-format to all .cpp and .h files

---
 lib/csapi/definitions/client_device.h | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

(limited to 'lib/csapi/definitions/client_device.h')

diff --git a/lib/csapi/definitions/client_device.h b/lib/csapi/definitions/client_device.h
index a6224f71..b473a037 100644
--- a/lib/csapi/definitions/client_device.h
+++ b/lib/csapi/definitions/client_device.h
@@ -8,28 +8,25 @@
 
 #include "converters.h"
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Data structures
 
     /// A client device
-    struct Device
-    {
+    struct Device {
         /// Identifier of this device.
         QString deviceId;
-        /// Display name set by the user for this device. Absent if no name has been
-        /// set.
+        /// Display name set by the user for this device. Absent if no name has
+        /// been set.
         QString displayName;
-        /// The IP address where this device was last seen. (May be a few minutes out
-        /// of date, for efficiency reasons).
+        /// The IP address where this device was last seen. (May be a few
+        /// minutes out of date, for efficiency reasons).
         QString lastSeenIp;
-        /// The timestamp (in milliseconds since the unix epoch) when this devices
-        /// was last seen. (May be a few minutes out of date, for efficiency
-        /// reasons).
+        /// The timestamp (in milliseconds since the unix epoch) when this
+        /// devices was last seen. (May be a few minutes out of date, for
+        /// efficiency reasons).
         Omittable<qint64> lastSeenTs;
     };
-    template <> struct JsonObjectConverter<Device>
-    {
+    template <> struct JsonObjectConverter<Device> {
         static void dumpTo(QJsonObject& jo, const Device& pod);
         static void fillFrom(const QJsonObject& jo, Device& pod);
     };
-- 
cgit v1.2.3


From 9e96bc9b8dec6613e3e2f2fd564e9f6bee9bbce4 Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Mon, 24 Jun 2019 07:38:50 +0900
Subject: csapi/*/**: clang-format contents of csapi subdirs as well

---
 lib/csapi/definitions/client_device.h | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

(limited to 'lib/csapi/definitions/client_device.h')

diff --git a/lib/csapi/definitions/client_device.h b/lib/csapi/definitions/client_device.h
index 7c63a9b6..e4accc35 100644
--- a/lib/csapi/definitions/client_device.h
+++ b/lib/csapi/definitions/client_device.h
@@ -4,10 +4,6 @@
 
 #pragma once
 
-
-
-#include "converters.h"
-
 #include "converters.h"
 
 namespace QMatrixClient
@@ -20,21 +16,22 @@ struct Device
 {
     /// Identifier of this device.
     QString deviceId;
-    /// Display name set by the user for this device. Absent if no name has beenset.
+    /// Display name set by the user for this device. Absent if no name has
+    /// beenset.
     QString displayName;
-    /// The IP address where this device was last seen. (May be a few minutes outof date, for efficiency reasons).
+    /// The IP address where this device was last seen. (May be a few minutes
+    /// outof date, for efficiency reasons).
     QString lastSeenIp;
-    /// The timestamp (in milliseconds since the unix epoch) when this deviceswas last seen. (May be a few minutes out of date, for efficiencyreasons).
+    /// The timestamp (in milliseconds since the unix epoch) when this deviceswas
+    /// last seen. (May be a few minutes out of date, for efficiencyreasons).
     Omittable<qint64> lastSeenTs;
-
-
 };
 
-template <> struct JsonObjectConverter<Device>
+template <>
+struct JsonObjectConverter<Device>
 {
     static void dumpTo(QJsonObject& jo, const Device& pod);
-    static void fillFrom(const QJsonObject& jo, Device& pod);};
-
-
+    static void fillFrom(const QJsonObject& jo, Device& pod);
+};
 
 } // namespace QMatrixClient
-- 
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/csapi/definitions/client_device.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/csapi/definitions/client_device.h')

diff --git a/lib/csapi/definitions/client_device.h b/lib/csapi/definitions/client_device.h
index e4accc35..f076c4da 100644
--- a/lib/csapi/definitions/client_device.h
+++ b/lib/csapi/definitions/client_device.h
@@ -6,7 +6,7 @@
 
 #include "converters.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Data structures
@@ -34,4 +34,4 @@ struct JsonObjectConverter<Device>
     static void fillFrom(const QJsonObject& jo, Device& pod);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
-- 
cgit v1.2.3