Update upstream source from tag 'upstream/0.6.4'

Update to upstream version '0.6.4'
with Debian dir aa8705fd74743e79c043bc9e3e425d5064404cfe

1 files changed, 22 insertions, 24 deletions

diff --git a/lib/jobs/mediathumbnailjob.h b/lib/jobs/mediathumbnailjob.h
index 7963796e..e6d39085 100644
--- a/lib/jobs/mediathumbnailjob.h
+++ b/lib/jobs/mediathumbnailjob.h
@@ -13,7 +13,7 @@
  *
  * 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
@@ -22,26 +22,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 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