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/jobs/basejob.h           | 4 ++--
 lib/jobs/downloadfilejob.h   | 2 +-
 lib/jobs/mediathumbnailjob.h | 2 +-
 lib/jobs/requestdata.h       | 4 +++-
 4 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'lib/jobs')

diff --git a/lib/jobs/basejob.h b/lib/jobs/basejob.h
index ddf243ed..f41fc63c 100644
--- a/lib/jobs/basejob.h
+++ b/lib/jobs/basejob.h
@@ -20,7 +20,7 @@ class ConnectionData;
 
 enum class HttpVerb { Get, Put, Post, Delete };
 
-class BaseJob : public QObject {
+class QUOTIENT_API BaseJob : public QObject {
     Q_OBJECT
     Q_PROPERTY(QUrl requestUrl READ requestUrl CONSTANT)
     Q_PROPERTY(int maxRetries READ maxRetries WRITE setMaxRetries)
@@ -470,7 +470,7 @@ private:
     QScopedPointer<Private> d;
 };
 
-inline bool isJobPending(BaseJob* job)
+inline bool QUOTIENT_API isJobPending(BaseJob* job)
 {
     return job && job->error() == BaseJob::Pending;
 }
diff --git a/lib/jobs/downloadfilejob.h b/lib/jobs/downloadfilejob.h
index 0752af89..d9f3b686 100644
--- a/lib/jobs/downloadfilejob.h
+++ b/lib/jobs/downloadfilejob.h
@@ -6,7 +6,7 @@
 #include "csapi/content-repo.h"
 
 namespace Quotient {
-class DownloadFileJob : public GetContentJob {
+class QUOTIENT_API DownloadFileJob : public GetContentJob {
 public:
     using GetContentJob::makeRequestUrl;
     static QUrl makeRequestUrl(QUrl baseUrl, const QUrl& mxcUri);
diff --git a/lib/jobs/mediathumbnailjob.h b/lib/jobs/mediathumbnailjob.h
index 3183feb1..c9f6da35 100644
--- a/lib/jobs/mediathumbnailjob.h
+++ b/lib/jobs/mediathumbnailjob.h
@@ -8,7 +8,7 @@
 #include <QtGui/QPixmap>
 
 namespace Quotient {
-class MediaThumbnailJob : public GetContentThumbnailJob {
+class QUOTIENT_API MediaThumbnailJob : public GetContentThumbnailJob {
 public:
     using GetContentThumbnailJob::makeRequestUrl;
     static QUrl makeRequestUrl(QUrl baseUrl, const QUrl& mxcUri,
diff --git a/lib/jobs/requestdata.h b/lib/jobs/requestdata.h
index 4f05e5ff..41ad833a 100644
--- a/lib/jobs/requestdata.h
+++ b/lib/jobs/requestdata.h
@@ -3,6 +3,8 @@
 
 #pragma once
 
+#include "quotient_export.h"
+
 #include <QtCore/QByteArray>
 
 #include <memory>
@@ -19,7 +21,7 @@ namespace Quotient {
  * as well as JSON (and possibly other structures in the future) to
  * a QByteArray consumed by QNetworkAccessManager request methods.
  */
-class RequestData {
+class QUOTIENT_API RequestData {
 public:
     RequestData(const QByteArray& a = {});
     RequestData(const QJsonObject& jo);
-- 
cgit v1.2.3


From a5a261b2c0dc60f99c8caa4729683d2780677f88 Mon Sep 17 00:00:00 2001
From: Alexey Rusakov <Kitsune-Ral@users.sf.net>
Date: Thu, 30 Dec 2021 12:46:50 +0100
Subject: Define destructors out-of-line when unique/scoped ptr are involved

Once visibility kicks in, MSVC changes its ways and tries to instantiate
Private classes wrapped in smart pointers upon their occurence in the
header file - which leads to build breakage because of a missing
destructor. Usually making the outer class destructor out-of-line helps
to fix this (see RoomEvent, for one example).
---
 lib/jobs/downloadfilejob.cpp | 2 ++
 lib/jobs/downloadfilejob.h   | 1 +
 lib/mxcreply.cpp             | 2 ++
 lib/mxcreply.h               | 2 ++
 4 files changed, 7 insertions(+)

(limited to 'lib/jobs')

diff --git a/lib/jobs/downloadfilejob.cpp b/lib/jobs/downloadfilejob.cpp
index 0b0531ad..6bf221cb 100644
--- a/lib/jobs/downloadfilejob.cpp
+++ b/lib/jobs/downloadfilejob.cpp
@@ -37,6 +37,8 @@ DownloadFileJob::DownloadFileJob(const QString& serverName,
     setObjectName(QStringLiteral("DownloadFileJob"));
 }
 
+DownloadFileJob::~DownloadFileJob() = default;
+
 QString DownloadFileJob::targetFileName() const
 {
     return (d->targetFile ? d->targetFile : d->tempFile)->fileName();
diff --git a/lib/jobs/downloadfilejob.h b/lib/jobs/downloadfilejob.h
index d9f3b686..9e807fe7 100644
--- a/lib/jobs/downloadfilejob.h
+++ b/lib/jobs/downloadfilejob.h
@@ -13,6 +13,7 @@ public:
 
     DownloadFileJob(const QString& serverName, const QString& mediaId,
                     const QString& localFilename = {});
+    ~DownloadFileJob() override;
 
     QString targetFileName() const;
 
diff --git a/lib/mxcreply.cpp b/lib/mxcreply.cpp
index 0b6643fc..fb16c79f 100644
--- a/lib/mxcreply.cpp
+++ b/lib/mxcreply.cpp
@@ -38,6 +38,8 @@ MxcReply::MxcReply(QNetworkReply* reply, Room* room, const QString &eventId)
     });
 }
 
+MxcReply::~MxcReply() = default;
+
 #if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
 #define ERROR_SIGNAL errorOccurred
 #else
diff --git a/lib/mxcreply.h b/lib/mxcreply.h
index 23049b7d..1d31d608 100644
--- a/lib/mxcreply.h
+++ b/lib/mxcreply.h
@@ -13,10 +13,12 @@ class Room;
 
 class QUOTIENT_API MxcReply : public QNetworkReply
 {
+    Q_OBJECT
 public:
     explicit MxcReply();
     explicit MxcReply(QNetworkReply *reply);
     MxcReply(QNetworkReply* reply, Room* room, const QString& eventId);
+    ~MxcReply() override;
 
 public Q_SLOTS:
     void abort() override;
-- 
cgit v1.2.3