Merge branch 'master' into kitsune-gtad

1 files changed, 4 insertions, 3 deletions

diff --git a/user.h b/user.h
index 79a6f5db..148ed64d 100644
--- a/user.h
+++ b/user.h
@@ -20,6 +20,7 @@
 
 #include <QtCore/QString>
 #include <QtCore/QObject>
+#include "avatar.h"
 
 namespace QMatrixClient
 {
@@ -30,7 +31,7 @@ namespace QMatrixClient
             Q_OBJECT
         public:
             User(QString userId, Connection* connection);
-            virtual ~User();
+            ~User() override;
 
             /**
              * Returns the id of the user
@@ -52,14 +53,14 @@ namespace QMatrixClient
             */
             Q_INVOKABLE QString bridged() const;
 
+            Avatar& avatarObject();
             QPixmap avatar(int requestedWidth, int requestedHeight);
 
-            const QUrl& avatarUrl() const;
+            QUrl avatarUrl() const;
 
             void processEvent(Event* event);
 
         public slots:
-            void requestAvatar();
             void rename(const QString& newName);
 
         signals: