From 7350fe82953cf6274b8845a890eafb21a09b9931 Mon Sep 17 00:00:00 2001
From: Alexey Rusakov <Kitsune-Ral@users.sf.net>
Date: Wed, 29 Dec 2021 15:59:58 +0100
Subject: Add QUOTIENT_API throughout non-generated code

This include all (hopefully) classes/structures and functions that have
non-inline definitions, as well as namespaces with Q_NAMESPACE since
those have non-inline (as of Qt 5.15) QMetaObject - for that a new
macro, QUO_NAMESPACE, has been devised to accommodate the lack of
Q_NAMESPACE_EXPORT in Qt before 5.14.
---
 lib/avatar.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'lib/avatar.h')

diff --git a/lib/avatar.h b/lib/avatar.h
index d4634aea..93f43948 100644
--- a/lib/avatar.h
+++ b/lib/avatar.h
@@ -3,6 +3,8 @@
 
 #pragma once
 
+#include "quotient_export.h"
+
 #include <QtCore/QUrl>
 #include <QtGui/QIcon>
 
@@ -12,7 +14,7 @@
 namespace Quotient {
 class Connection;
 
-class Avatar {
+class QUOTIENT_API Avatar {
 public:
     explicit Avatar();
     explicit Avatar(QUrl url);
-- 
cgit v1.2.3


From 7d37d296f942ac993d041b4576ed52265170c4a8 Mon Sep 17 00:00:00 2001
From: Alexey Rusakov <Kitsune-Ral@users.sf.net>
Date: Sun, 2 Jan 2022 06:03:26 +0100
Subject: Add ImplPtr and makeImpl

The original (more complex and comprehensive) solution belongs to
https://oliora.github.io/2015/12/29/pimpl-and-rule-of-zero.html - this
commit only provides a small wrapper for non-copyable Private class
implementations common throughout libQuotient. Unlike the original,
default initialisation is made explicit - you have to pass
ZeroImpl<Private>() instead (and I firmly believe it's a good thing:
normally pointers to Private should not remain nullptr). The reason
ZeroImpl<> is not a template variable is quite simple: unique_ptr is
non-copyable and so cannot be initialised from; while a template
function will initialise the value in-place thanks to copy elision.
---
 lib/avatar.h | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'lib/avatar.h')

diff --git a/lib/avatar.h b/lib/avatar.h
index 93f43948..c94dc369 100644
--- a/lib/avatar.h
+++ b/lib/avatar.h
@@ -3,13 +3,12 @@
 
 #pragma once
 
-#include "quotient_export.h"
+#include "util.h"
 
 #include <QtCore/QUrl>
 #include <QtGui/QIcon>
 
 #include <functional>
-#include <memory>
 
 namespace Quotient {
 class Connection;
@@ -18,9 +17,6 @@ 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)>;
@@ -41,6 +37,6 @@ public:
 
 private:
     class Private;
-    std::unique_ptr<Private> d;
+    ImplPtr<Private> d;
 };
 } // namespace Quotient
-- 
cgit v1.2.3