Update upstream source from tag 'upstream/0.6.4'

Update to upstream version '0.6.4'
with Debian dir aa8705fd74743e79c043bc9e3e425d5064404cfe

1 files changed, 27 insertions, 33 deletions

diff --git a/lib/jobs/requestdata.h b/lib/jobs/requestdata.h
index db011b61..9cb5ecaf 100644
--- a/lib/jobs/requestdata.h
+++ b/lib/jobs/requestdata.h
@@ -13,49 +13,43 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #pragma once
 
+#include <QtCore/QByteArray>
+
 #include <memory>
 
-class QByteArray;
 class QJsonObject;
 class QJsonArray;
 class QJsonDocument;
 class QIODevice;
 
-namespace QMatrixClient
-{
-    /**
-     * A simple wrapper that represents the request body.
-     * Provides a unified interface to dump an unstructured byte stream
-     * as well as JSON (and possibly other structures in the future) to
-     * a QByteArray consumed by QNetworkAccessManager request methods.
-     */
-    class RequestData
-    {
-        public:
-            RequestData() = default;
-            RequestData(const QByteArray& a);
-            RequestData(const QJsonObject& jo);
-            RequestData(const QJsonArray& ja);
-            RequestData(QIODevice* source)
-                : _source(std::unique_ptr<QIODevice>(source))
-            { }
-            RequestData(const RequestData&) = delete;
-            RequestData& operator=(const RequestData&) = delete;
-            RequestData(RequestData&&) = default;
-            RequestData& operator=(RequestData&&) = default;
-            ~RequestData();
+namespace Quotient {
+/**
+ * A simple wrapper that represents the request body.
+ * Provides a unified interface to dump an unstructured byte stream
+ * as well as JSON (and possibly other structures in the future) to
+ * a QByteArray consumed by QNetworkAccessManager request methods.
+ */
+class RequestData {
+public:
+    RequestData(const QByteArray& a = {});
+    RequestData(const QJsonObject& jo);
+    RequestData(const QJsonArray& ja);
+    RequestData(QIODevice* source) : _source(std::unique_ptr<QIODevice>(source))
+    {}
+    RequestData(RequestData&&) = default;
+    RequestData& operator=(RequestData&&) = default;
+    ~RequestData();
 
-            QIODevice* source() const
-            {
-                return _source.get();
-            }
+    QIODevice* source() const { return _source.get(); }
 
-        private:
-            std::unique_ptr<QIODevice> _source;
-    };
-} // namespace QMatrixClient
+private:
+    std::unique_ptr<QIODevice> _source;
+};
+} // namespace Quotient
+/// \deprecated Use namespace Quotient instead
+namespace QMatrixClient = Quotient;