forked from loafle/openapi-generator-original
Remove further Qt support before Qt 5.15.2 (#19824)
* Remove further Qt support before Qt 5.15.2 This is a follow-up pull request for [#19164] (https://github.com/OpenAPITools/openapi-generator/pull/19164), which removes the further handling of older Qt versions. * Updates samples to match the mustach config files. --------- Co-authored-by: Daniel Simon <mail@dlins.de>
This commit is contained in:
parent
2838b9584b
commit
8849156d29
@ -47,13 +47,7 @@ void {{prefix}}HttpRequestInput::add_file(QString variable_name, QString local_f
|
||||
|
||||
{{prefix}}HttpRequestWorker::{{prefix}}HttpRequestWorker(QObject *parent, QNetworkAccessManager *_manager)
|
||||
: QObject(parent), manager(_manager), timeOutTimer(this), isResponseCompressionEnabled(false), isRequestCompressionEnabled(false), httpResponseCode(-1) {
|
||||
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
|
||||
randomGenerator = QRandomGenerator(QDateTime::currentDateTime().toSecsSinceEpoch());
|
||||
#else
|
||||
qsrand(QDateTime::currentDateTime().toTime_t());
|
||||
#endif
|
||||
|
||||
if (manager == nullptr) {
|
||||
manager = new QNetworkAccessManager(this);
|
||||
}
|
||||
@ -212,13 +206,8 @@ void {{prefix}}HttpRequestWorker::execute({{prefix}}HttpRequestInput *input) {
|
||||
// variable layout is MULTIPART
|
||||
|
||||
boundary = QString("__-----------------------%1%2")
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
|
||||
.arg(QDateTime::currentDateTime().toSecsSinceEpoch())
|
||||
.arg(randomGenerator.generate());
|
||||
#else
|
||||
.arg(QDateTime::currentDateTime().toTime_t())
|
||||
.arg(qrand());
|
||||
#endif
|
||||
QString boundary_delimiter = "--";
|
||||
QString new_line = "\r\n";
|
||||
|
||||
@ -359,16 +348,7 @@ void {{prefix}}HttpRequestWorker::execute({{prefix}}HttpRequestInput *input) {
|
||||
} else if (input->http_method == "DELETE") {
|
||||
reply = manager->deleteResource(request);
|
||||
} else {
|
||||
#if (QT_VERSION >= 0x050800)
|
||||
reply = manager->sendCustomRequest(request, input->http_method.toLatin1(), request_content);
|
||||
#else
|
||||
QBuffer *buffer = new QBuffer;
|
||||
buffer->setData(request_content);
|
||||
buffer->open(QIODevice::ReadOnly);
|
||||
|
||||
reply = manager->sendCustomRequest(request, input->http_method.toLatin1(), buffer);
|
||||
buffer->setParent(reply);
|
||||
#endif
|
||||
}
|
||||
if (reply != nullptr) {
|
||||
reply->setParent(this);
|
||||
|
@ -54,13 +54,7 @@ void PFXHttpRequestInput::add_file(QString variable_name, QString local_filename
|
||||
|
||||
PFXHttpRequestWorker::PFXHttpRequestWorker(QObject *parent, QNetworkAccessManager *_manager)
|
||||
: QObject(parent), manager(_manager), timeOutTimer(this), isResponseCompressionEnabled(false), isRequestCompressionEnabled(false), httpResponseCode(-1) {
|
||||
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
|
||||
randomGenerator = QRandomGenerator(QDateTime::currentDateTime().toSecsSinceEpoch());
|
||||
#else
|
||||
qsrand(QDateTime::currentDateTime().toTime_t());
|
||||
#endif
|
||||
|
||||
if (manager == nullptr) {
|
||||
manager = new QNetworkAccessManager(this);
|
||||
}
|
||||
@ -219,13 +213,8 @@ void PFXHttpRequestWorker::execute(PFXHttpRequestInput *input) {
|
||||
// variable layout is MULTIPART
|
||||
|
||||
boundary = QString("__-----------------------%1%2")
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
|
||||
.arg(QDateTime::currentDateTime().toSecsSinceEpoch())
|
||||
.arg(randomGenerator.generate());
|
||||
#else
|
||||
.arg(QDateTime::currentDateTime().toTime_t())
|
||||
.arg(qrand());
|
||||
#endif
|
||||
QString boundary_delimiter = "--";
|
||||
QString new_line = "\r\n";
|
||||
|
||||
@ -366,16 +355,7 @@ void PFXHttpRequestWorker::execute(PFXHttpRequestInput *input) {
|
||||
} else if (input->http_method == "DELETE") {
|
||||
reply = manager->deleteResource(request);
|
||||
} else {
|
||||
#if (QT_VERSION >= 0x050800)
|
||||
reply = manager->sendCustomRequest(request, input->http_method.toLatin1(), request_content);
|
||||
#else
|
||||
QBuffer *buffer = new QBuffer;
|
||||
buffer->setData(request_content);
|
||||
buffer->open(QIODevice::ReadOnly);
|
||||
|
||||
reply = manager->sendCustomRequest(request, input->http_method.toLatin1(), buffer);
|
||||
buffer->setParent(reply);
|
||||
#endif
|
||||
}
|
||||
if (reply != nullptr) {
|
||||
reply->setParent(this);
|
||||
|
@ -54,13 +54,7 @@ void PFXHttpRequestInput::add_file(QString variable_name, QString local_filename
|
||||
|
||||
PFXHttpRequestWorker::PFXHttpRequestWorker(QObject *parent, QNetworkAccessManager *_manager)
|
||||
: QObject(parent), manager(_manager), timeOutTimer(this), isResponseCompressionEnabled(false), isRequestCompressionEnabled(false), httpResponseCode(-1) {
|
||||
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
|
||||
randomGenerator = QRandomGenerator(QDateTime::currentDateTime().toSecsSinceEpoch());
|
||||
#else
|
||||
qsrand(QDateTime::currentDateTime().toTime_t());
|
||||
#endif
|
||||
|
||||
if (manager == nullptr) {
|
||||
manager = new QNetworkAccessManager(this);
|
||||
}
|
||||
@ -219,13 +213,8 @@ void PFXHttpRequestWorker::execute(PFXHttpRequestInput *input) {
|
||||
// variable layout is MULTIPART
|
||||
|
||||
boundary = QString("__-----------------------%1%2")
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
|
||||
.arg(QDateTime::currentDateTime().toSecsSinceEpoch())
|
||||
.arg(randomGenerator.generate());
|
||||
#else
|
||||
.arg(QDateTime::currentDateTime().toTime_t())
|
||||
.arg(qrand());
|
||||
#endif
|
||||
QString boundary_delimiter = "--";
|
||||
QString new_line = "\r\n";
|
||||
|
||||
@ -366,16 +355,7 @@ void PFXHttpRequestWorker::execute(PFXHttpRequestInput *input) {
|
||||
} else if (input->http_method == "DELETE") {
|
||||
reply = manager->deleteResource(request);
|
||||
} else {
|
||||
#if (QT_VERSION >= 0x050800)
|
||||
reply = manager->sendCustomRequest(request, input->http_method.toLatin1(), request_content);
|
||||
#else
|
||||
QBuffer *buffer = new QBuffer;
|
||||
buffer->setData(request_content);
|
||||
buffer->open(QIODevice::ReadOnly);
|
||||
|
||||
reply = manager->sendCustomRequest(request, input->http_method.toLatin1(), buffer);
|
||||
buffer->setParent(reply);
|
||||
#endif
|
||||
}
|
||||
if (reply != nullptr) {
|
||||
reply->setParent(this);
|
||||
|
Loading…
x
Reference in New Issue
Block a user