From 620c2fe55b327e555477ed29bd670ddc6b9023d1 Mon Sep 17 00:00:00 2001
From: Alexey Rusakov <Kitsune-Ral@users.sf.net>
Date: Sat, 12 Jun 2021 21:01:38 +0200
Subject: Make RequestData compile again

This fixes reliance on QIODevice being magically available for
std::unique_ptr<> by indirect inclusion. Since Qt 6 this inclusion no
more happens, time to #include <QIODevice> explicitly.
---
 lib/jobs/requestdata.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'lib/jobs/requestdata.h')

diff --git a/lib/jobs/requestdata.h b/lib/jobs/requestdata.h
index 4958e0f9..21657631 100644
--- a/lib/jobs/requestdata.h
+++ b/lib/jobs/requestdata.h
@@ -24,8 +24,7 @@ public:
     RequestData(const QByteArray& a = {});
     RequestData(const QJsonObject& jo);
     RequestData(const QJsonArray& ja);
-    RequestData(QIODevice* source) : _source(std::unique_ptr<QIODevice>(source))
-    {}
+    RequestData(QIODevice* source);
     RequestData(RequestData&&) = default;
     RequestData& operator=(RequestData&&) = default;
     ~RequestData();
-- 
cgit v1.2.3


From c50420a0f2df7a7bf291312c38ac43e2c9f58141 Mon Sep 17 00:00:00 2001
From: Alexey Rusakov <Kitsune-Ral@users.sf.net>
Date: Sun, 22 Aug 2021 20:15:04 +0200
Subject: Drop QMatrixClient namespace alias

---
 lib/avatar.h           | 2 --
 lib/jobs/requestdata.h | 2 --
 lib/logging.h          | 2 --
 3 files changed, 6 deletions(-)

(limited to 'lib/jobs/requestdata.h')

diff --git a/lib/avatar.h b/lib/avatar.h
index 37e1eeef..d4634aea 100644
--- a/lib/avatar.h
+++ b/lib/avatar.h
@@ -42,5 +42,3 @@ private:
     std::unique_ptr<Private> d;
 };
 } // namespace Quotient
-/// \deprecated Use namespace Quotient instead
-namespace QMatrixClient = Quotient;
diff --git a/lib/jobs/requestdata.h b/lib/jobs/requestdata.h
index 21657631..4f05e5ff 100644
--- a/lib/jobs/requestdata.h
+++ b/lib/jobs/requestdata.h
@@ -35,5 +35,3 @@ private:
     std::unique_ptr<QIODevice> _source;
 };
 } // namespace Quotient
-/// \deprecated Use namespace Quotient instead
-namespace QMatrixClient = Quotient;
diff --git a/lib/logging.h b/lib/logging.h
index 264215e1..1d1394e8 100644
--- a/lib/logging.h
+++ b/lib/logging.h
@@ -67,8 +67,6 @@ inline qint64 profilerMinNsecs()
         * 1000;
 }
 } // namespace Quotient
-/// \deprecated Use namespace Quotient instead
-namespace QMatrixClient = Quotient;
 
 inline QDebug operator<<(QDebug debug_object, const QElapsedTimer& et)
 {
-- 
cgit v1.2.3