Minor changes
This commit is contained in:
@@ -12,6 +12,7 @@ auto CoreServices::networkAccessManager() -> QWeakPointer<QNetworkAccessManager>
|
|||||||
if(!s_networkAccessPointer)
|
if(!s_networkAccessPointer)
|
||||||
{
|
{
|
||||||
s_networkAccessManager = new QNetworkAccessManager;
|
s_networkAccessManager = new QNetworkAccessManager;
|
||||||
|
s_networkAccessManager->setAutoDeleteReplies(true);
|
||||||
|
|
||||||
QObject::connect(
|
QObject::connect(
|
||||||
s_networkAccessManager,
|
s_networkAccessManager,
|
||||||
|
|||||||
@@ -372,7 +372,7 @@ private:
|
|||||||
Q_PROPERTY(ShaderChannel *channel1 READ channel1 WRITE setChannel1 NOTIFY channel1Changed FINAL)
|
Q_PROPERTY(ShaderChannel *channel1 READ channel1 WRITE setChannel1 NOTIFY channel1Changed FINAL)
|
||||||
Q_PROPERTY(ShaderChannel *channel2 READ channel2 WRITE setChannel2 NOTIFY channel2Changed FINAL)
|
Q_PROPERTY(ShaderChannel *channel2 READ channel2 WRITE setChannel2 NOTIFY channel2Changed FINAL)
|
||||||
Q_PROPERTY(ShaderChannel *channel3 READ channel3 WRITE setChannel3 NOTIFY channel3Changed FINAL)
|
Q_PROPERTY(ShaderChannel *channel3 READ channel3 WRITE setChannel3 NOTIFY channel3Changed FINAL)
|
||||||
Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged FINAL)
|
Q_PROPERTY(QString source READ source WRITE setSource NOTIFY sourceChanged FINAL)
|
||||||
Q_PROPERTY(Type type READ type WRITE setType NOTIFY typeChanged FINAL)
|
Q_PROPERTY(Type type READ type WRITE setType NOTIFY typeChanged FINAL)
|
||||||
Q_PROPERTY(MirrorMode mirrorMode READ mirrorMode WRITE setMirrorMode NOTIFY mirrorModeChanged FINAL)
|
Q_PROPERTY(MirrorMode mirrorMode READ mirrorMode WRITE setMirrorMode NOTIFY mirrorModeChanged FINAL)
|
||||||
Q_PROPERTY(TextureRepeat textureRepeat READ textureRepeat WRITE setTextureRepeat NOTIFY textureRepeatChanged FINAL)
|
Q_PROPERTY(TextureRepeat textureRepeat READ textureRepeat WRITE setTextureRepeat NOTIFY textureRepeatChanged FINAL)
|
||||||
@@ -516,14 +516,13 @@ public:
|
|||||||
rootObject[QStringLiteral("license")] = license();
|
rootObject[QStringLiteral("license")] = license();
|
||||||
|
|
||||||
QJsonObject bufferObject = bufferJson(this);
|
QJsonObject bufferObject = bufferJson(this);
|
||||||
QJsonObject channelObject = channelJson(this);
|
|
||||||
|
|
||||||
const QStringList bufferKeys = bufferObject.keys();
|
const QStringList bufferKeys = bufferObject.keys();
|
||||||
for(const QString &key : bufferKeys)
|
for(const QString &key : bufferKeys)
|
||||||
{
|
{
|
||||||
rootObject[key] = bufferObject[key];
|
rootObject[key] = bufferObject[key];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QJsonObject channelObject = channelJson(this);
|
||||||
const QStringList channelKeys = channelObject.keys();
|
const QStringList channelKeys = channelObject.keys();
|
||||||
for(const QString &key : channelKeys)
|
for(const QString &key : channelKeys)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,8 +1,7 @@
|
|||||||
#include "downloadmanager.h"
|
#include "downloadmanager.h"
|
||||||
#include "common/coreservices.h"
|
#include "common/coreservices.h"
|
||||||
#include "common/exceptions.h"
|
#include "common/exceptions.h"
|
||||||
#include "common/logging.h"
|
#include "common/shaderpack.h"
|
||||||
#include "common/ShaderPack.h"
|
|
||||||
|
|
||||||
DownloadManager::DownloadManager(QObject *parent)
|
DownloadManager::DownloadManager(QObject *parent)
|
||||||
: QObject{parent}
|
: QObject{parent}
|
||||||
@@ -47,7 +46,6 @@ auto DownloadManager::downloadImage(const QString &author, const QString &author
|
|||||||
[this, url, author, authorId, description]()
|
[this, url, author, authorId, description]()
|
||||||
{
|
{
|
||||||
QNetworkRequest request(url);
|
QNetworkRequest request(url);
|
||||||
QUrl localUri;
|
|
||||||
QString id = QUuid::createUuidV7().toString(QUuid::WithoutBraces);
|
QString id = QUuid::createUuidV7().toString(QUuid::WithoutBraces);
|
||||||
|
|
||||||
QFuture<QUrl> downloadUri = download(request, id);
|
QFuture<QUrl> downloadUri = download(request, id);
|
||||||
|
|||||||
Reference in New Issue
Block a user