Merge branch 'master' of https://github.com/quotient-im/libQuotient into

bhat-libqtolm-update

1 files changed, 38 insertions, 35 deletions

diff --git a/lib/csapi/voip.h b/lib/csapi/voip.h
index bb858499..38abfa27 100644
--- a/lib/csapi/voip.h
+++ b/lib/csapi/voip.h
@@ -8,39 +8,42 @@
 
 #include <QtCore/QJsonObject>
 
-namespace QMatrixClient
+namespace Quotient
 {
-    // Operations
-
-    /// Obtain TURN server credentials.
-    ///
-    /// This API provides credentials for the client to use when initiating
-    /// calls.
-    class GetTurnServerJob : public BaseJob
-    {
-        public:
-            explicit GetTurnServerJob();
-
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * GetTurnServerJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl);
-
-            ~GetTurnServerJob() override;
-
-            // Result properties
-
-            /// The TURN server credentials.
-            const QJsonObject& data() const;
-
-        protected:
-            Status parseJson(const QJsonDocument& data) override;
-
-        private:
-            class Private;
-            QScopedPointer<Private> d;
-    };
-} // namespace QMatrixClient
+
+// Operations
+
+/// Obtain TURN server credentials.
+/*!
+ * This API provides credentials for the client to use when initiating
+ * calls.
+ */
+class GetTurnServerJob : public BaseJob
+{
+public:
+    explicit GetTurnServerJob();
+
+    /*! Construct a URL without creating a full-fledged job object
+     *
+     * This function can be used when a URL for
+     * GetTurnServerJob is necessary but the job
+     * itself isn't.
+     */
+    static QUrl makeRequestUrl(QUrl baseUrl);
+
+    ~GetTurnServerJob() override;
+
+    // Result properties
+
+    /// The TURN server credentials.
+    const QJsonObject& data() const;
+
+protected:
+    Status parseJson(const QJsonDocument& data) override;
+
+private:
+    class Private;
+    QScopedPointer<Private> d;
+};
+
+} // namespace Quotient