Merge branch 'dev'

The result is FTBFS as yet; next commits will fix that, along with a few
other things.

1 files changed, 4 insertions, 6 deletions

diff --git a/lib/avatar.h b/lib/avatar.h
index d4634aea..c94dc369 100644
--- a/lib/avatar.h
+++ b/lib/avatar.h
@@ -3,22 +3,20 @@
 
 #pragma once
 
+#include "util.h"
+
 #include <QtCore/QUrl>
 #include <QtGui/QIcon>
 
 #include <functional>
-#include <memory>
 
 namespace Quotient {
 class Connection;
 
-class Avatar {
+class QUOTIENT_API 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(QUrl)>;
@@ -39,6 +37,6 @@ public:
 
 private:
     class Private;
-    std::unique_ptr<Private> d;
+    ImplPtr<Private> d;
 };
 } // namespace Quotient