New upstream version 0.7.0

1 files changed, 23 insertions, 40 deletions

diff --git a/lib/jobs/mediathumbnailjob.h b/lib/jobs/mediathumbnailjob.h
index 7963796e..c9f6da35 100644
--- a/lib/jobs/mediathumbnailjob.h
+++ b/lib/jobs/mediathumbnailjob.h
@@ -1,20 +1,5 @@
-/******************************************************************************
- * Copyright (C) 2016 Felix Rohrbach <kde@fxrh.de>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * 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
- */
+// SPDX-FileCopyrightText: 2018 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
 
 #pragma once
 
@@ -22,26 +7,24 @@
 
 #include <QtGui/QPixmap>
 
-namespace QMatrixClient
-{
-    class MediaThumbnailJob: public GetContentThumbnailJob
-    {
-        public:
-            using GetContentThumbnailJob::makeRequestUrl;
-            static QUrl makeRequestUrl(QUrl baseUrl,
-                                       const QUrl& mxcUri, QSize requestedSize);
-
-            MediaThumbnailJob(const QString& serverName, const QString& mediaId,
-                              QSize requestedSize);
-            MediaThumbnailJob(const QUrl& mxcUri, QSize requestedSize);
-
-            QImage thumbnail() const;
-            QImage scaledThumbnail(QSize toSize) const;
-
-        protected:
-            Status parseReply(QNetworkReply* reply) override;
-
-        private:
-            QImage _thumbnail;
-    };
-}  // namespace QMatrixClient
+namespace Quotient {
+class QUOTIENT_API MediaThumbnailJob : public GetContentThumbnailJob {
+public:
+    using GetContentThumbnailJob::makeRequestUrl;
+    static QUrl makeRequestUrl(QUrl baseUrl, const QUrl& mxcUri,
+                               QSize requestedSize);
+
+    MediaThumbnailJob(const QString& serverName, const QString& mediaId,
+                      QSize requestedSize);
+    MediaThumbnailJob(const QUrl& mxcUri, QSize requestedSize);
+
+    QImage thumbnail() const;
+    QImage scaledThumbnail(QSize toSize) const;
+
+protected:
+    Status prepareResult() override;
+
+private:
+    QImage _thumbnail;
+};
+} // namespace Quotient