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

bhat-libqtolm-update

1 files changed, 37 insertions, 37 deletions

diff --git a/lib/avatar.h b/lib/avatar.h
index c86345e3..7a566bfa 100644
--- a/lib/avatar.h
+++ b/lib/avatar.h
@@ -13,49 +13,49 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #pragma once
 
-#include <QtGui/QIcon>
 #include <QtCore/QUrl>
+#include <QtGui/QIcon>
 
 #include <functional>
 #include <memory>
 
-namespace QMatrixClient
-{
-    class Connection;
-
-    class Avatar
-    {
-        public:
-            explicit Avatar();
-            explicit Avatar(QUrl url);
-            Avatar(Avatar&&);
-            ~Avatar();
-            Avatar& operator=(Avatar&&);
-
-            using get_callback_t = std::function<void()>;
-            using upload_callback_t = std::function<void(QString)>;
-
-            QImage get(Connection* connection, int dimension,
-                       get_callback_t callback) const;
-            QImage get(Connection* connection, int w, int h,
-                       get_callback_t callback) const;
-
-            bool upload(Connection* connection, const QString& fileName,
-                        upload_callback_t callback) const;
-            bool upload(Connection* connection, QIODevice* source,
-                        upload_callback_t callback) const;
-
-            QString mediaId() const;
-            QUrl url() const;
-            bool updateUrl(const QUrl& newUrl);
-
-        private:
-            class Private;
-            std::unique_ptr<Private> d;
-    };
-}  // namespace QMatrixClient
+namespace Quotient {
+class Connection;
+
+class Avatar {
+public:
+    explicit Avatar();
+    explicit Avatar(QUrl url);
+    Avatar(Avatar&&);
+    ~Avatar();
+    Avatar& operator=(Avatar&&);
+
+    using get_callback_t = std::function<void()>;
+    using upload_callback_t = std::function<void(QString)>;
+
+    QImage get(Connection* connection, int dimension,
+               get_callback_t callback) const;
+    QImage get(Connection* connection, int w, int h,
+               get_callback_t callback) const;
+
+    bool upload(Connection* connection, const QString& fileName,
+                upload_callback_t callback) const;
+    bool upload(Connection* connection, QIODevice* source,
+                upload_callback_t callback) const;
+
+    QString mediaId() const;
+    QUrl url() const;
+    bool updateUrl(const QUrl& newUrl);
+
+private:
+    class Private;
+    std::unique_ptr<Private> d;
+};
+} // namespace Quotient
+/// \deprecated Use namespace Quotient instead
+namespace QMatrixClient = Quotient;
\ No newline at end of file