aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/csapi/content-repo.cpp24
-rw-r--r--lib/csapi/content-repo.h6
-rw-r--r--lib/jobs/mediathumbnailjob.cpp2
3 files changed, 16 insertions, 16 deletions
diff --git a/lib/csapi/content-repo.cpp b/lib/csapi/content-repo.cpp
index 7eebeae5..a127dfad 100644
--- a/lib/csapi/content-repo.cpp
+++ b/lib/csapi/content-repo.cpp
@@ -60,7 +60,7 @@ class GetContentJob::Private
public:
QString contentType;
QString contentDisposition;
- QIODevice* content;
+ QIODevice* data;
};
BaseJob::Query queryToGetContent(bool allowRemote)
@@ -99,16 +99,16 @@ const QString& GetContentJob::contentDisposition() const
return d->contentDisposition;
}
-QIODevice* GetContentJob::content() const
+QIODevice* GetContentJob::data() const
{
- return d->content;
+ return d->data;
}
BaseJob::Status GetContentJob::parseReply(QNetworkReply* reply)
{
d->contentType = reply->rawHeader("Content-Type");
d->contentDisposition = reply->rawHeader("Content-Disposition");
- d->content = reply;
+ d->data = reply;
return Success;
}
@@ -117,7 +117,7 @@ class GetContentOverrideNameJob::Private
public:
QString contentType;
QString contentDisposition;
- QIODevice* content;
+ QIODevice* data;
};
BaseJob::Query queryToGetContentOverrideName(bool allowRemote)
@@ -156,16 +156,16 @@ const QString& GetContentOverrideNameJob::contentDisposition() const
return d->contentDisposition;
}
-QIODevice* GetContentOverrideNameJob::content() const
+QIODevice* GetContentOverrideNameJob::data() const
{
- return d->content;
+ return d->data;
}
BaseJob::Status GetContentOverrideNameJob::parseReply(QNetworkReply* reply)
{
d->contentType = reply->rawHeader("Content-Type");
d->contentDisposition = reply->rawHeader("Content-Disposition");
- d->content = reply;
+ d->data = reply;
return Success;
}
@@ -173,7 +173,7 @@ class GetContentThumbnailJob::Private
{
public:
QString contentType;
- QIODevice* content;
+ QIODevice* data;
};
BaseJob::Query queryToGetContentThumbnail(Omittable<int> width, Omittable<int> height, const QString& method, bool allowRemote)
@@ -213,15 +213,15 @@ const QString& GetContentThumbnailJob::contentType() const
return d->contentType;
}
-QIODevice* GetContentThumbnailJob::content() const
+QIODevice* GetContentThumbnailJob::data() const
{
- return d->content;
+ return d->data;
}
BaseJob::Status GetContentThumbnailJob::parseReply(QNetworkReply* reply)
{
d->contentType = reply->rawHeader("Content-Type");
- d->content = reply;
+ d->data = reply;
return Success;
}
diff --git a/lib/csapi/content-repo.h b/lib/csapi/content-repo.h
index 582fedab..f3b90c9d 100644
--- a/lib/csapi/content-repo.h
+++ b/lib/csapi/content-repo.h
@@ -49,7 +49,7 @@ namespace QMatrixClient
const QString& contentType() const;
const QString& contentDisposition() const;
- QIODevice* content() const;
+ QIODevice* data() const;
protected:
Status parseReply(QNetworkReply* reply) override;
@@ -77,7 +77,7 @@ namespace QMatrixClient
const QString& contentType() const;
const QString& contentDisposition() const;
- QIODevice* content() const;
+ QIODevice* data() const;
protected:
Status parseReply(QNetworkReply* reply) override;
@@ -104,7 +104,7 @@ namespace QMatrixClient
// Result properties
const QString& contentType() const;
- QIODevice* content() const;
+ QIODevice* data() const;
protected:
Status parseReply(QNetworkReply* reply) override;
diff --git a/lib/jobs/mediathumbnailjob.cpp b/lib/jobs/mediathumbnailjob.cpp
index dda1cdb4..8dfb6094 100644
--- a/lib/jobs/mediathumbnailjob.cpp
+++ b/lib/jobs/mediathumbnailjob.cpp
@@ -56,7 +56,7 @@ BaseJob::Status MediaThumbnailJob::parseReply(QNetworkReply* reply)
if (!result.good())
return result;
- if( _thumbnail.loadFromData(content()->readAll()) )
+ if( _thumbnail.loadFromData(data()->readAll()) )
return Success;
return { IncorrectResponseError, "Could not read image data" };