summaryrefslogtreecommitdiffstats
path: root/src/network/access
diff options
context:
space:
mode:
Diffstat (limited to 'src/network/access')
-rw-r--r--src/network/access/access.pri6
-rw-r--r--src/network/access/qnetworkaccessmanager.cpp12
-rw-r--r--src/network/access/qnetworkaccessmanager.h4
-rw-r--r--src/network/access/qnetworkreplywasmimpl.cpp (renamed from src/network/access/qnetworkreplyemscriptenimpl.cpp)84
-rw-r--r--src/network/access/qnetworkreplywasmimpl_p.h (renamed from src/network/access/qnetworkreplyemscriptenimpl_p.h)24
5 files changed, 65 insertions, 65 deletions
diff --git a/src/network/access/access.pri b/src/network/access/access.pri
index caa81b9497..410bf18ad0 100644
--- a/src/network/access/access.pri
+++ b/src/network/access/access.pri
@@ -68,11 +68,11 @@ qtConfig(networkdiskcache) {
mac: LIBS_PRIVATE += -framework Security
-emscripten: {
+wasm: {
SOURCES += \
- access/qnetworkreplyemscriptenimpl.cpp
+ access/qnetworkreplywasmimpl.cpp
HEADERS += \
- access/qnetworkreplyemscriptenimpl_p.h
+ access/qnetworkreplywasmimpl_p.h
}
include($$PWD/../../3rdparty/zlib_dependency.pri)
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp
index 8b174d813f..08a17f8f77 100644
--- a/src/network/access/qnetworkaccessmanager.cpp
+++ b/src/network/access/qnetworkaccessmanager.cpp
@@ -82,9 +82,9 @@
#include <SystemConfiguration/SystemConfiguration.h>
#include <Security/SecKeychain.h>
#endif
-#ifdef Q_OS_HTML5
+#ifdef Q_OS_WASM
#include <QDebug>
-#include "qnetworkreplyemscriptenimpl_p.h"
+#include "qnetworkreplywasmimpl_p.h"
#endif
QT_BEGIN_NAMESPACE
@@ -1347,12 +1347,12 @@ QNetworkReply *QNetworkAccessManager::createRequest(QNetworkAccessManager::Opera
bool isLocalFile = req.url().isLocalFile();
QString scheme = req.url().scheme();
-#ifdef Q_OS_HTML5
+#ifdef Q_OS_WASM
if (scheme == QLatin1String("http") || scheme == QLatin1String("https")) {
- // return new QNetworkReplyEmscriptenImpl(this, req, op);
+ // return new QNetworkReplyWasmImpl(this, req, op);
- QNetworkReplyEmscriptenImpl *reply = new QNetworkReplyEmscriptenImpl(this);
- QNetworkReplyEmscriptenImplPrivate *priv = reply->d_func();
+ QNetworkReplyWasmImpl *reply = new QNetworkReplyWasmImpl(this);
+ QNetworkReplyWasmImplPrivate *priv = reply->d_func();
priv->manager = this;
priv->setup(op, req, outgoingData);
return reply;
diff --git a/src/network/access/qnetworkaccessmanager.h b/src/network/access/qnetworkaccessmanager.h
index 6082e73977..0dc2be3543 100644
--- a/src/network/access/qnetworkaccessmanager.h
+++ b/src/network/access/qnetworkaccessmanager.h
@@ -194,8 +194,8 @@ private:
friend class QNetworkReplyHttpImpl;
friend class QNetworkReplyHttpImplPrivate;
friend class QNetworkReplyFileImpl;
-#ifdef Q_OS_HTML5
- friend class QNetworkReplyEmscriptenImpl;
+#ifdef Q_OS_WASM
+ friend class QNetworkReplyWasmImpl;
#endif
Q_DECLARE_PRIVATE(QNetworkAccessManager)
Q_PRIVATE_SLOT(d_func(), void _q_replyFinished())
diff --git a/src/network/access/qnetworkreplyemscriptenimpl.cpp b/src/network/access/qnetworkreplywasmimpl.cpp
index e81c7a52a4..18dcd3d4b3 100644
--- a/src/network/access/qnetworkreplyemscriptenimpl.cpp
+++ b/src/network/access/qnetworkreplywasmimpl.cpp
@@ -37,7 +37,7 @@
**
****************************************************************************/
-#include "qnetworkreplyemscriptenimpl_p.h"
+#include "qnetworkreplywasmimpl_p.h"
#include <QTimer>
#include "QtCore/qdatetime.h"
@@ -53,7 +53,7 @@
QT_BEGIN_NAMESPACE
-QNetworkReplyEmscriptenImplPrivate::QNetworkReplyEmscriptenImplPrivate()
+QNetworkReplyWasmImplPrivate::QNetworkReplyWasmImplPrivate()
: QNetworkReplyPrivate(),
managerPrivate(0),
downloadBufferReadPosition(0),
@@ -63,20 +63,20 @@ QNetworkReplyEmscriptenImplPrivate::QNetworkReplyEmscriptenImplPrivate()
{
}
-QNetworkReplyEmscriptenImplPrivate::~QNetworkReplyEmscriptenImplPrivate()
+QNetworkReplyWasmImplPrivate::~QNetworkReplyWasmImplPrivate()
{
}
-QNetworkReplyEmscriptenImpl::~QNetworkReplyEmscriptenImpl()
+QNetworkReplyWasmImpl::~QNetworkReplyWasmImpl()
{
}
-QNetworkReplyEmscriptenImpl::QNetworkReplyEmscriptenImpl(QObject *parent)
- : QNetworkReply(*new QNetworkReplyEmscriptenImplPrivate(), parent)
+QNetworkReplyWasmImpl::QNetworkReplyWasmImpl(QObject *parent)
+ : QNetworkReply(*new QNetworkReplyWasmImplPrivate(), parent)
{
}
-QByteArray QNetworkReplyEmscriptenImpl::methodName() const
+QByteArray QNetworkReplyWasmImpl::methodName() const
{
switch (operation()) {
case QNetworkAccessManager::HeadOperation:
@@ -97,19 +97,19 @@ QByteArray QNetworkReplyEmscriptenImpl::methodName() const
return QByteArray();
}
-void QNetworkReplyEmscriptenImpl::close()
+void QNetworkReplyWasmImpl::close()
{
QNetworkReply::close();
}
-void QNetworkReplyEmscriptenImpl::abort()
+void QNetworkReplyWasmImpl::abort()
{
close();
}
-qint64 QNetworkReplyEmscriptenImpl::bytesAvailable() const
+qint64 QNetworkReplyWasmImpl::bytesAvailable() const
{
- Q_D(const QNetworkReplyEmscriptenImpl);
+ Q_D(const QNetworkReplyWasmImpl);
if (!d->isFinished)
return QNetworkReply::bytesAvailable();
@@ -117,12 +117,12 @@ qint64 QNetworkReplyEmscriptenImpl::bytesAvailable() const
return QNetworkReply::bytesAvailable() + d->downloadBufferCurrentSize - d->downloadBufferReadPosition;
}
-bool QNetworkReplyEmscriptenImpl::isSequential() const
+bool QNetworkReplyWasmImpl::isSequential() const
{
return true;
}
-qint64 QNetworkReplyEmscriptenImpl::size() const
+qint64 QNetworkReplyWasmImpl::size() const
{
return QNetworkReply::size();
}
@@ -130,9 +130,9 @@ qint64 QNetworkReplyEmscriptenImpl::size() const
/*!
\internal
*/
-qint64 QNetworkReplyEmscriptenImpl::readData(char *data, qint64 maxlen)
+qint64 QNetworkReplyWasmImpl::readData(char *data, qint64 maxlen)
{
- Q_D(QNetworkReplyEmscriptenImpl);
+ Q_D(QNetworkReplyWasmImpl);
qint64 howMuch = qMin(maxlen, (d->downloadBuffer.size()- d->downloadBufferReadPosition));
memcpy(data, d->downloadBuffer.constData(), howMuch);
@@ -141,10 +141,10 @@ qint64 QNetworkReplyEmscriptenImpl::readData(char *data, qint64 maxlen)
return howMuch;
}
-void QNetworkReplyEmscriptenImplPrivate::setup(QNetworkAccessManager::Operation op, const QNetworkRequest &req,
+void QNetworkReplyWasmImplPrivate::setup(QNetworkAccessManager::Operation op, const QNetworkRequest &req,
QIODevice *data)
{
- Q_Q(QNetworkReplyEmscriptenImpl);
+ Q_Q(QNetworkReplyWasmImpl);
outgoingData = data;
request = req;
@@ -186,9 +186,9 @@ void QNetworkReplyEmscriptenImplPrivate::setup(QNetworkAccessManager::Operation
doSendRequest();
}
-void QNetworkReplyEmscriptenImplPrivate::onLoadCallback(void *data, int statusCode, int statusReason, int readyState, int buffer, int bufferSize)
+void QNetworkReplyWasmImplPrivate::onLoadCallback(void *data, int statusCode, int statusReason, int readyState, int buffer, int bufferSize)
{
- QNetworkReplyEmscriptenImplPrivate *handler = reinterpret_cast<QNetworkReplyEmscriptenImplPrivate*>(data);
+ QNetworkReplyWasmImplPrivate *handler = reinterpret_cast<QNetworkReplyWasmImplPrivate*>(data);
QString reasonStr = QString::fromUtf8((char *)statusReason);
@@ -217,19 +217,19 @@ void QNetworkReplyEmscriptenImplPrivate::onLoadCallback(void *data, int statusCo
};
}
-void QNetworkReplyEmscriptenImplPrivate::onProgressCallback(void* data, int bytesWritten, int total, uint timestamp)
+void QNetworkReplyWasmImplPrivate::onProgressCallback(void* data, int bytesWritten, int total, uint timestamp)
{
Q_UNUSED(timestamp);
- QNetworkReplyEmscriptenImplPrivate *handler = reinterpret_cast<QNetworkReplyEmscriptenImplPrivate*>(data);
+ QNetworkReplyWasmImplPrivate *handler = reinterpret_cast<QNetworkReplyWasmImplPrivate*>(data);
handler->emitDataReadProgress(bytesWritten, total);
}
-void QNetworkReplyEmscriptenImplPrivate::onRequestErrorCallback(void* data, int statusCode, int statusReason)
+void QNetworkReplyWasmImplPrivate::onRequestErrorCallback(void* data, int statusCode, int statusReason)
{
QString reasonStr = QString::fromUtf8((char *)statusReason);
- QNetworkReplyEmscriptenImplPrivate *handler = reinterpret_cast<QNetworkReplyEmscriptenImplPrivate*>(data);
+ QNetworkReplyWasmImplPrivate *handler = reinterpret_cast<QNetworkReplyWasmImplPrivate*>(data);
handler->q_func()->setAttribute(QNetworkRequest::HttpStatusCodeAttribute, statusCode);
if (!reasonStr.isEmpty())
@@ -241,15 +241,15 @@ void QNetworkReplyEmscriptenImplPrivate::onRequestErrorCallback(void* data, int
}
}
-void QNetworkReplyEmscriptenImplPrivate::onResponseHeadersCallback(void* data, int headers)
+void QNetworkReplyWasmImplPrivate::onResponseHeadersCallback(void* data, int headers)
{
- QNetworkReplyEmscriptenImplPrivate *handler = reinterpret_cast<QNetworkReplyEmscriptenImplPrivate*>(data);
+ QNetworkReplyWasmImplPrivate *handler = reinterpret_cast<QNetworkReplyWasmImplPrivate*>(data);
handler->headersReceived((char *)headers);
}
-void QNetworkReplyEmscriptenImplPrivate::doSendRequest()
+void QNetworkReplyWasmImplPrivate::doSendRequest()
{
- Q_Q(QNetworkReplyEmscriptenImpl);
+ Q_Q(QNetworkReplyWasmImpl);
totalDownloadSize = 0;
jsRequest(QString::fromUtf8(q->methodName()), // GET POST
request.url().toString(),
@@ -260,7 +260,7 @@ void QNetworkReplyEmscriptenImplPrivate::doSendRequest()
}
/* const QString &body, const QList<QPair<QByteArray, QByteArray> > &headers ,*/
-void QNetworkReplyEmscriptenImplPrivate::jsRequest(const QString &verb, const QString &url, void *loadCallback, void *progressCallback, void *errorCallback, void *onResponseHeadersCallback)
+void QNetworkReplyWasmImplPrivate::jsRequest(const QString &verb, const QString &url, void *loadCallback, void *progressCallback, void *errorCallback, void *onResponseHeadersCallback)
{
QString extraDataString;
@@ -419,10 +419,10 @@ void QNetworkReplyEmscriptenImplPrivate::jsRequest(const QString &verb, const QS
);
}
-void QNetworkReplyEmscriptenImplPrivate::emitReplyError(QNetworkReply::NetworkError errorCode, const QString &errorString)
+void QNetworkReplyWasmImplPrivate::emitReplyError(QNetworkReply::NetworkError errorCode, const QString &errorString)
{
Q_UNUSED(errorCode)
- Q_Q(QNetworkReplyEmscriptenImpl);
+ Q_Q(QNetworkReplyWasmImpl);
q->setError(errorCode, errorString);
emit q->error(errorCode);
@@ -431,9 +431,9 @@ void QNetworkReplyEmscriptenImplPrivate::emitReplyError(QNetworkReply::NetworkEr
emit q->finished();
}
-void QNetworkReplyEmscriptenImplPrivate::emitDataReadProgress(qint64 bytesReceived, qint64 bytesTotal)
+void QNetworkReplyWasmImplPrivate::emitDataReadProgress(qint64 bytesReceived, qint64 bytesTotal)
{
- Q_Q(QNetworkReplyEmscriptenImpl);
+ Q_Q(QNetworkReplyWasmImpl);
totalDownloadSize = bytesTotal;
@@ -442,9 +442,9 @@ void QNetworkReplyEmscriptenImplPrivate::emitDataReadProgress(qint64 bytesReceiv
emit q->downloadProgress(bytesReceived, totalDownloadSize);
}
-void QNetworkReplyEmscriptenImplPrivate::dataReceived(char *buffer, int bufferSize)
+void QNetworkReplyWasmImplPrivate::dataReceived(char *buffer, int bufferSize)
{
- Q_Q(QNetworkReplyEmscriptenImpl);
+ Q_Q(QNetworkReplyWasmImpl);
if (bufferSize > 0)
q->setReadBufferSize(bufferSize);
@@ -506,9 +506,9 @@ static int parseHeaderName(const QByteArray &headerName)
}
-void QNetworkReplyEmscriptenImplPrivate::headersReceived(char *buffer)
+void QNetworkReplyWasmImplPrivate::headersReceived(char *buffer)
{
- Q_Q(QNetworkReplyEmscriptenImpl);
+ Q_Q(QNetworkReplyWasmImpl);
QString bufferString = QString::fromUtf8(buffer);
if (!bufferString.isEmpty()) {
@@ -531,9 +531,9 @@ void QNetworkReplyEmscriptenImplPrivate::headersReceived(char *buffer)
emit q->metaDataChanged();
}
-void QNetworkReplyEmscriptenImplPrivate::_q_bufferOutgoingDataFinished()
+void QNetworkReplyWasmImplPrivate::_q_bufferOutgoingDataFinished()
{
- Q_Q(QNetworkReplyEmscriptenImpl);
+ Q_Q(QNetworkReplyWasmImpl);
// make sure this is only called once, ever.
//_q_bufferOutgoingData may call it or the readChannelFinished emission
@@ -548,9 +548,9 @@ void QNetworkReplyEmscriptenImplPrivate::_q_bufferOutgoingDataFinished()
doSendRequest();
}
-void QNetworkReplyEmscriptenImplPrivate::_q_bufferOutgoingData()
+void QNetworkReplyWasmImplPrivate::_q_bufferOutgoingData()
{
- Q_Q(QNetworkReplyEmscriptenImpl);
+ Q_Q(QNetworkReplyWasmImpl);
if (!outgoingDataBuffer) {
// first call, create our buffer
@@ -592,7 +592,7 @@ void QNetworkReplyEmscriptenImplPrivate::_q_bufferOutgoingData()
}
//taken from qhttpthreaddelegate.cpp
-QNetworkReply::NetworkError QNetworkReplyEmscriptenImplPrivate::statusCodeFromHttp(int httpStatusCode, const QUrl &url)
+QNetworkReply::NetworkError QNetworkReplyWasmImplPrivate::statusCodeFromHttp(int httpStatusCode, const QUrl &url)
{
QNetworkReply::NetworkError code;
// we've got an error
@@ -665,5 +665,5 @@ QNetworkReply::NetworkError QNetworkReplyEmscriptenImplPrivate::statusCodeFromHt
QT_END_NAMESPACE
-#include "moc_qnetworkreplyemscriptenimpl_p.cpp"
+#include "moc_qnetworkreplywasmimpl_p.cpp"
diff --git a/src/network/access/qnetworkreplyemscriptenimpl_p.h b/src/network/access/qnetworkreplywasmimpl_p.h
index 89df7771cc..e683da61f3 100644
--- a/src/network/access/qnetworkreplyemscriptenimpl_p.h
+++ b/src/network/access/qnetworkreplywasmimpl_p.h
@@ -37,8 +37,8 @@
**
****************************************************************************/
-#ifndef QNETWORKREPLYEMSCRIPTENIMPL_H
-#define QNETWORKREPLYEMSCRIPTENIMPL_H
+#ifndef QNETWORKREPLYWASMIMPL_H
+#define QNETWORKREPLYWASMIMPL_H
//
// W A R N I N G
@@ -66,13 +66,13 @@ QT_BEGIN_NAMESPACE
class QIODevice;
//class QNetworkAccessBackend;
-class QNetworkReplyEmscriptenImplPrivate;
-class QNetworkReplyEmscriptenImpl: public QNetworkReply
+class QNetworkReplyWasmImplPrivate;
+class QNetworkReplyWasmImpl: public QNetworkReply
{
Q_OBJECT
public:
- QNetworkReplyEmscriptenImpl(QObject *parent = 0/*QNetworkAccessManager *manager, const QNetworkRequest &req, const QNetworkAccessManager::Operation op, QIODevice *outgoingData*/);
- ~QNetworkReplyEmscriptenImpl();
+ QNetworkReplyWasmImpl(QObject *parent = 0/*QNetworkAccessManager *manager, const QNetworkRequest &req, const QNetworkAccessManager::Operation op, QIODevice *outgoingData*/);
+ ~QNetworkReplyWasmImpl();
virtual void abort() Q_DECL_OVERRIDE;
// reimplemented from QNetworkReply
@@ -86,7 +86,7 @@ public:
void setup(QNetworkAccessManager::Operation op, const QNetworkRequest &request,
QIODevice *outgoingData);
- Q_DECLARE_PRIVATE(QNetworkReplyEmscriptenImpl)
+ Q_DECLARE_PRIVATE(QNetworkReplyWasmImpl)
Q_PRIVATE_SLOT(d_func(), void emitReplyError(QNetworkReply::NetworkError errorCode, const QString &errorString))
Q_PRIVATE_SLOT(d_func(), void emitDataReadProgress(qint64 done, qint64 total))
@@ -98,11 +98,11 @@ private:
};
-class QNetworkReplyEmscriptenImplPrivate: public QNetworkReplyPrivate
+class QNetworkReplyWasmImplPrivate: public QNetworkReplyPrivate
{
public:
- QNetworkReplyEmscriptenImplPrivate();
- ~QNetworkReplyEmscriptenImplPrivate();
+ QNetworkReplyWasmImplPrivate();
+ ~QNetworkReplyWasmImplPrivate();
QNetworkAccessManagerPrivate *managerPrivate;
void doSendRequest();
@@ -144,11 +144,11 @@ public:
QSharedPointer<QRingBuffer> outgoingDataBuffer;
static QNetworkReply::NetworkError statusCodeFromHttp(int httpStatusCode, const QUrl &url);
- Q_DECLARE_PUBLIC(QNetworkReplyEmscriptenImpl)
+ Q_DECLARE_PUBLIC(QNetworkReplyWasmImpl)
};
QT_END_NAMESPACE
//Q_DECLARE_METATYPE(QNetworkRequest::KnownHeaders)
-#endif // QNETWORKREPLYEMSCRIPTENIMPL_H
+#endif // QNETWORKREPLYWASMIMPL_H
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 08:48:36 +0000