forked from loafle/openapi-generator-original
[Qt5/C++] Arrays of primitive types fix (#4046)
* Corrects issue #3410 when trying to create Arrays of primitive types * Use c++11 nullptr keyword and various indentation issues resolved * ran petstore on new mustaches
This commit is contained in:
parent
27be0ed197
commit
8bee0de4e9
@ -37,7 +37,7 @@ void HttpRequestInput::add_file(QString variable_name, QString local_filename, Q
|
|||||||
|
|
||||||
|
|
||||||
HttpRequestWorker::HttpRequestWorker(QObject *parent)
|
HttpRequestWorker::HttpRequestWorker(QObject *parent)
|
||||||
: QObject(parent), manager(NULL)
|
: QObject(parent), manager(nullptr)
|
||||||
{
|
{
|
||||||
qsrand(QDateTime::currentDateTime().toTime_t());
|
qsrand(QDateTime::currentDateTime().toTime_t());
|
||||||
|
|
||||||
@ -181,8 +181,8 @@ void HttpRequestWorker::execute(HttpRequestInput *input) {
|
|||||||
|
|
||||||
// ensure necessary variables are available
|
// ensure necessary variables are available
|
||||||
if (
|
if (
|
||||||
file_info->local_filename == NULL || file_info->local_filename.isEmpty()
|
file_info->local_filename == nullptr || file_info->local_filename.isEmpty()
|
||||||
|| file_info->variable_name == NULL || file_info->variable_name.isEmpty()
|
|| file_info->variable_name == nullptr || file_info->variable_name.isEmpty()
|
||||||
|| !fi.exists() || !fi.isFile() || !fi.isReadable()
|
|| !fi.exists() || !fi.isFile() || !fi.isReadable()
|
||||||
) {
|
) {
|
||||||
// silent abort for the current file
|
// silent abort for the current file
|
||||||
@ -196,7 +196,7 @@ void HttpRequestWorker::execute(HttpRequestInput *input) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// ensure filename for the request
|
// ensure filename for the request
|
||||||
if (file_info->request_filename == NULL || file_info->request_filename.isEmpty()) {
|
if (file_info->request_filename == nullptr || file_info->request_filename.isEmpty()) {
|
||||||
file_info->request_filename = fi.fileName();
|
file_info->request_filename = fi.fileName();
|
||||||
if (file_info->request_filename.isEmpty()) {
|
if (file_info->request_filename.isEmpty()) {
|
||||||
file_info->request_filename = "file";
|
file_info->request_filename = "file";
|
||||||
@ -215,7 +215,7 @@ void HttpRequestWorker::execute(HttpRequestInput *input) {
|
|||||||
));
|
));
|
||||||
request_content.append(new_line);
|
request_content.append(new_line);
|
||||||
|
|
||||||
if (file_info->mime_type != NULL && !file_info->mime_type.isEmpty()) {
|
if (file_info->mime_type != nullptr && !file_info->mime_type.isEmpty()) {
|
||||||
request_content.append("Content-Type: ");
|
request_content.append("Content-Type: ");
|
||||||
request_content.append(file_info->mime_type);
|
request_content.append(file_info->mime_type);
|
||||||
request_content.append(new_line);
|
request_content.append(new_line);
|
||||||
|
@ -87,7 +87,7 @@ void
|
|||||||
HttpRequestWorker *worker = new HttpRequestWorker();
|
HttpRequestWorker *worker = new HttpRequestWorker();
|
||||||
HttpRequestInput input(fullPath, "{{httpMethod}}");
|
HttpRequestInput input(fullPath, "{{httpMethod}}");
|
||||||
|
|
||||||
{{#formParams}}if ({{paramName}} != NULL) {
|
{{#formParams}}if ({{paramName}} != nullptr) {
|
||||||
{{^isFile}}input.add_var("{{baseName}}", *{{paramName}});{{/isFile}}{{#isFile}}input.add_file("{{baseName}}", (*{{paramName}}).local_filename, (*{{paramName}}).request_filename, (*{{paramName}}).mime_type);{{/isFile}}
|
{{^isFile}}input.add_var("{{baseName}}", *{{paramName}});{{/isFile}}{{#isFile}}input.add_file("{{baseName}}", (*{{paramName}}).local_filename, (*{{paramName}}).request_filename, (*{{paramName}}).mime_type);{{/isFile}}
|
||||||
}
|
}
|
||||||
{{/formParams}}
|
{{/formParams}}
|
||||||
|
@ -10,7 +10,7 @@ namespace Swagger {
|
|||||||
|
|
||||||
void
|
void
|
||||||
setValue(void* value, QJsonValue obj, QString type, QString complexType) {
|
setValue(void* value, QJsonValue obj, QString type, QString complexType) {
|
||||||
if(value == NULL) {
|
if(value == nullptr) {
|
||||||
// can't set value with a null pointer
|
// can't set value with a null pointer
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -37,7 +37,7 @@ setValue(void* value, QJsonValue obj, QString type, QString complexType) {
|
|||||||
else if (QStringLiteral("QString").compare(type) == 0) {
|
else if (QStringLiteral("QString").compare(type) == 0) {
|
||||||
QString **val = static_cast<QString**>(value);
|
QString **val = static_cast<QString**>(value);
|
||||||
|
|
||||||
if(val != NULL) {
|
if(val != nullptr) {
|
||||||
if(!obj.isNull()) {
|
if(!obj.isNull()) {
|
||||||
// create a new value and return
|
// create a new value and return
|
||||||
delete *val;
|
delete *val;
|
||||||
@ -45,19 +45,19 @@ setValue(void* value, QJsonValue obj, QString type, QString complexType) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
// set target to NULL
|
// set target to nullptr
|
||||||
delete *val;
|
delete *val;
|
||||||
*val = NULL;
|
*val = nullptr;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
qDebug() << "Can't set value because the target pointer is NULL";
|
qDebug() << "Can't set value because the target pointer is nullptr";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (QStringLiteral("QDateTime").compare(type) == 0) {
|
else if (QStringLiteral("QDateTime").compare(type) == 0) {
|
||||||
QDateTime **val = static_cast<QDateTime**>(value);
|
QDateTime **val = static_cast<QDateTime**>(value);
|
||||||
|
|
||||||
if(val != NULL) {
|
if(val != nullptr) {
|
||||||
if(!obj.isNull()) {
|
if(!obj.isNull()) {
|
||||||
// create a new value and return
|
// create a new value and return
|
||||||
delete *val;
|
delete *val;
|
||||||
@ -65,19 +65,19 @@ setValue(void* value, QJsonValue obj, QString type, QString complexType) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
// set target to NULL
|
// set target to nullptr
|
||||||
delete *val;
|
delete *val;
|
||||||
*val = NULL;
|
*val = nullptr;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
qDebug() << "Can't set value because the target pointer is NULL";
|
qDebug() << "Can't set value because the target pointer is nullptr";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (QStringLiteral("QDate").compare(type) == 0) {
|
else if (QStringLiteral("QDate").compare(type) == 0) {
|
||||||
QDate **val = static_cast<QDate**>(value);
|
QDate **val = static_cast<QDate**>(value);
|
||||||
|
|
||||||
if(val != NULL) {
|
if(val != nullptr) {
|
||||||
if(!obj.isNull()) {
|
if(!obj.isNull()) {
|
||||||
// create a new value and return
|
// create a new value and return
|
||||||
delete *val;
|
delete *val;
|
||||||
@ -85,19 +85,19 @@ setValue(void* value, QJsonValue obj, QString type, QString complexType) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
// set target to NULL
|
// set target to nullptr
|
||||||
delete *val;
|
delete *val;
|
||||||
*val = NULL;
|
*val = nullptr;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
qDebug() << "Can't set value because the target pointer is NULL";
|
qDebug() << "Can't set value because the target pointer is nullptr";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (QStringLiteral("QByteArray").compare(type) == 0) {
|
else if (QStringLiteral("QByteArray").compare(type) == 0) {
|
||||||
QByteArray **val = static_cast<QByteArray**>(value);
|
QByteArray **val = static_cast<QByteArray**>(value);
|
||||||
|
|
||||||
if(val != NULL) {
|
if(val != nullptr) {
|
||||||
if(!obj.isNull()) {
|
if(!obj.isNull()) {
|
||||||
// create a new value and return
|
// create a new value and return
|
||||||
delete *val;
|
delete *val;
|
||||||
@ -106,20 +106,20 @@ setValue(void* value, QJsonValue obj, QString type, QString complexType) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
// set target to NULL
|
// set target to nullptr
|
||||||
delete *val;
|
delete *val;
|
||||||
*val = NULL;
|
*val = nullptr;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
qDebug() << "Can't set value because the target pointer is NULL";
|
qDebug() << "Can't set value because the target pointer is nullptr";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if(type.startsWith("SWG") && obj.isObject()) {
|
else if(type.startsWith("SWG") && obj.isObject()) {
|
||||||
// complex type
|
// complex type
|
||||||
QJsonObject jsonObj = obj.toObject();
|
QJsonObject jsonObj = obj.toObject();
|
||||||
SWGObject * so = (SWGObject*)Swagger::create(type);
|
SWGObject * so = (SWGObject*)Swagger::create(type);
|
||||||
if(so != NULL) {
|
if(so != nullptr) {
|
||||||
so->fromJsonObject(jsonObj);
|
so->fromJsonObject(jsonObj);
|
||||||
SWGObject **val = static_cast<SWGObject**>(value);
|
SWGObject **val = static_cast<SWGObject**>(value);
|
||||||
delete *val;
|
delete *val;
|
||||||
@ -167,19 +167,19 @@ setValue(void* value, QJsonValue obj, QString type, QString complexType) {
|
|||||||
output->append((void*)&val);
|
output->append((void*)&val);
|
||||||
}
|
}
|
||||||
else if(QStringLiteral("QString").compare(complexType) == 0) {
|
else if(QStringLiteral("QString").compare(complexType) == 0) {
|
||||||
QString val;
|
QString * val = new QString();
|
||||||
setValue(&val, jval, QStringLiteral("QString"), QStringLiteral(""));
|
setValue(&val, jval, QStringLiteral("QString"), QStringLiteral(""));
|
||||||
output->append((void*)&val);
|
output->append((void*)val);
|
||||||
}
|
}
|
||||||
else if(QStringLiteral("QDate").compare(complexType) == 0) {
|
else if(QStringLiteral("QDate").compare(complexType) == 0) {
|
||||||
QDate val;
|
QDate * val = new QDate();
|
||||||
setValue(&val, jval, QStringLiteral("QDate"), QStringLiteral(""));
|
setValue(&val, jval, QStringLiteral("QDate"), QStringLiteral(""));
|
||||||
output->append((void*)&val);
|
output->append((void*)val);
|
||||||
}
|
}
|
||||||
else if(QStringLiteral("QDateTime").compare(complexType) == 0) {
|
else if(QStringLiteral("QDateTime").compare(complexType) == 0) {
|
||||||
QDateTime val;
|
QDateTime * val = new QDateTime();
|
||||||
setValue(&val, jval, QStringLiteral("QDateTime"), QStringLiteral(""));
|
setValue(&val, jval, QStringLiteral("QDateTime"), QStringLiteral(""));
|
||||||
output->append((void*)&val);
|
output->append((void*)val);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -191,14 +191,14 @@ setValue(void* value, QJsonValue obj, QString type, QString complexType) {
|
|||||||
|
|
||||||
void
|
void
|
||||||
toJsonValue(QString name, void* value, QJsonObject* output, QString type) {
|
toJsonValue(QString name, void* value, QJsonObject* output, QString type) {
|
||||||
if(value == NULL) {
|
if(value == nullptr) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if(type.startsWith("SWG")) {
|
if(type.startsWith("SWG")) {
|
||||||
SWGObject *swgObject = reinterpret_cast<SWGObject *>(value);
|
SWGObject *swgObject = reinterpret_cast<SWGObject *>(value);
|
||||||
if(swgObject != NULL) {
|
if(swgObject != nullptr) {
|
||||||
QJsonObject* o = (*swgObject).asJsonObject();
|
QJsonObject* o = (*swgObject).asJsonObject();
|
||||||
if(name != NULL) {
|
if(name != nullptr) {
|
||||||
output->insert(name, *o);
|
output->insert(name, *o);
|
||||||
delete o;
|
delete o;
|
||||||
}
|
}
|
||||||
@ -253,7 +253,7 @@ toJsonArray(QList<void*>* value, QJsonArray* output, QString innerName, QString
|
|||||||
foreach(void* obj, *value) {
|
foreach(void* obj, *value) {
|
||||||
QJsonObject element;
|
QJsonObject element;
|
||||||
|
|
||||||
toJsonValue(NULL, obj, &element, innerType);
|
toJsonValue(nullptr, obj, &element, innerType);
|
||||||
output->append(element);
|
output->append(element);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -27,13 +27,15 @@ namespace Swagger {
|
|||||||
|
|
||||||
void
|
void
|
||||||
{{classname}}::init() {
|
{{classname}}::init() {
|
||||||
{{#vars}}{{name}} = {{{defaultValue}}};
|
{{#vars}}
|
||||||
|
{{name}} = {{{defaultValue}}};
|
||||||
{{/vars}}
|
{{/vars}}
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
{{classname}}::cleanup() {
|
{{classname}}::cleanup() {
|
||||||
{{#vars}}{{#complexType}}if({{name}} != NULL) {
|
{{#vars}}{{#complexType}}
|
||||||
|
if({{name}} != nullptr) {
|
||||||
{{#isContainer}}QList<{{complexType}}*>* arr = {{name}};
|
{{#isContainer}}QList<{{complexType}}*>* arr = {{name}};
|
||||||
foreach({{complexType}}* o, *arr) {
|
foreach({{complexType}}* o, *arr) {
|
||||||
delete o;
|
delete o;
|
||||||
@ -54,7 +56,12 @@ void
|
|||||||
|
|
||||||
void
|
void
|
||||||
{{classname}}::fromJsonObject(QJsonObject &pJson) {
|
{{classname}}::fromJsonObject(QJsonObject &pJson) {
|
||||||
{{#vars}}setValue(&{{name}}, pJson["{{name}}"], "{{baseType}}", "{{complexType}}");
|
{{#vars}}
|
||||||
|
{{^isContainer}}::Swagger::setValue(&{{name}}, pJson["{{name}}"], "{{baseType}}", "{{complexType}}");{{/isContainer}}
|
||||||
|
{{#isContainer}}
|
||||||
|
{{#complexType}}::Swagger::setValue(&{{name}}, pJson["{{name}}"], "{{baseType}}", "{{complexType}}");{{/complexType}}
|
||||||
|
{{^complexType}}::Swagger::setValue(&{{name}}, pJson["{{name}}"], "{{baseType}}", "{{items.baseType}}");{{/complexType}}
|
||||||
|
{{/isContainer}}
|
||||||
{{/vars}}
|
{{/vars}}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -71,21 +78,18 @@ QString
|
|||||||
QJsonObject*
|
QJsonObject*
|
||||||
{{classname}}::asJsonObject() {
|
{{classname}}::asJsonObject() {
|
||||||
QJsonObject* obj = new QJsonObject();
|
QJsonObject* obj = new QJsonObject();
|
||||||
{{#vars}}{{#complexType}}
|
{{#vars}}{{#complexType}}{{^isContainer}}{{#complexType}}
|
||||||
{{^isContainer}}{{#complexType}}
|
toJsonValue(QString("{{name}}"), {{name}}, obj, QString("{{complexType}}"));{{/complexType}}{{^complexType}}
|
||||||
toJsonValue(QString("{{name}}"), {{name}}, obj, QString("{{complexType}}"));
|
if({{name}} != nullptr && *{{name}} != nullptr) {
|
||||||
{{/complexType}}{{^complexType}}
|
obj->insert("{{name}}", QJsonValue(*{{name}}));
|
||||||
else if({{name}} != NULL && *{{name}} != NULL) {
|
}{{/complexType}}{{/isContainer}}{{#isContainer}}
|
||||||
obj->insert("{{name}}", QJsonValue(*{{name}}));
|
|
||||||
}{{/complexType}}
|
|
||||||
{{/isContainer}}{{#isContainer}}
|
|
||||||
QList<{{complexType}}*>* {{name}}List = {{name}};
|
|
||||||
QJsonArray {{name}}JsonArray;
|
QJsonArray {{name}}JsonArray;
|
||||||
toJsonArray((QList<void*>*){{name}}, &{{name}}JsonArray, "{{name}}", "{{complexType}}");
|
toJsonArray((QList<void*>*){{name}}, &{{name}}JsonArray, "{{name}}", "{{complexType}}");
|
||||||
|
obj->insert("{{name}}", {{name}}JsonArray);{{/isContainer}}{{/complexType}}{{^complexType}}{{^isContainer}}
|
||||||
obj->insert("{{name}}", {{name}}JsonArray);
|
obj->insert("{{name}}", QJsonValue({{name}}));{{/isContainer}}{{#isContainer}}
|
||||||
{{/isContainer}}
|
QJsonArray {{name}}JsonArray;
|
||||||
{{/complexType}}{{^complexType}}obj->insert("{{name}}", QJsonValue({{name}}));{{/complexType}}
|
toJsonArray((QList<void*>*){{name}}, &{{name}}JsonArray, "{{name}}", "{{items.baseType}}");
|
||||||
|
obj->insert("{{name}}", {{name}}JsonArray);{{/isContainer}}{{/complexType}}
|
||||||
{{/vars}}
|
{{/vars}}
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
|
@ -32,12 +32,15 @@ public:
|
|||||||
void fromJsonObject(QJsonObject &json);
|
void fromJsonObject(QJsonObject &json);
|
||||||
{{classname}}* fromJson(QString &jsonString);
|
{{classname}}* fromJson(QString &jsonString);
|
||||||
|
|
||||||
{{#vars}}{{{datatype}}} {{getter}}();
|
{{#vars}}
|
||||||
|
{{{datatype}}} {{getter}}();
|
||||||
void {{setter}}({{{datatype}}} {{name}});
|
void {{setter}}({{{datatype}}} {{name}});
|
||||||
|
|
||||||
{{/vars}}
|
{{/vars}}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
{{#vars}}{{{datatype}}} {{name}};
|
{{#vars}}
|
||||||
|
{{{datatype}}} {{name}};
|
||||||
{{/vars}}
|
{{/vars}}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -11,19 +11,19 @@ namespace Swagger {
|
|||||||
return new {{classname}}();
|
return new {{classname}}();
|
||||||
}
|
}
|
||||||
{{/model}}{{/models}}
|
{{/model}}{{/models}}
|
||||||
return NULL;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
inline void* create(QString json, QString type) {
|
inline void* create(QString json, QString type) {
|
||||||
void* val = create(type);
|
void* val = create(type);
|
||||||
if(val != NULL) {
|
if(val != nullptr) {
|
||||||
SWGObject* obj = static_cast<SWGObject*>(val);
|
SWGObject* obj = static_cast<SWGObject*>(val);
|
||||||
return obj->fromJson(json);
|
return obj->fromJson(json);
|
||||||
}
|
}
|
||||||
if(type.startsWith("QString")) {
|
if(type.startsWith("QString")) {
|
||||||
return new QString();
|
return new QString();
|
||||||
}
|
}
|
||||||
return NULL;
|
return nullptr;
|
||||||
}
|
}
|
||||||
} /* namespace Swagger */
|
} /* namespace Swagger */
|
||||||
|
|
||||||
|
@ -7,12 +7,12 @@
|
|||||||
class {{prefix}}Object {
|
class {{prefix}}Object {
|
||||||
public:
|
public:
|
||||||
virtual QJsonObject* asJsonObject() {
|
virtual QJsonObject* asJsonObject() {
|
||||||
return NULL;
|
return nullptr;
|
||||||
}
|
}
|
||||||
virtual ~SWGObject() {}
|
virtual ~SWGObject() {}
|
||||||
virtual SWGObject* fromJson(QString &jsonString) {
|
virtual SWGObject* fromJson(QString &jsonString) {
|
||||||
Q_UNUSED(jsonString);
|
Q_UNUSED(jsonString);
|
||||||
return NULL;
|
return nullptr;
|
||||||
}
|
}
|
||||||
virtual void fromJsonObject(QJsonObject &json) {
|
virtual void fromJsonObject(QJsonObject &json) {
|
||||||
Q_UNUSED(json);
|
Q_UNUSED(json);
|
||||||
|
@ -51,17 +51,19 @@ SWGApiResponse::~SWGApiResponse() {
|
|||||||
void
|
void
|
||||||
SWGApiResponse::init() {
|
SWGApiResponse::init() {
|
||||||
code = 0;
|
code = 0;
|
||||||
type = new QString("");
|
type = new QString("");
|
||||||
message = new QString("");
|
message = new QString("");
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
SWGApiResponse::cleanup() {
|
SWGApiResponse::cleanup() {
|
||||||
|
|
||||||
if(type != NULL) {
|
|
||||||
|
if(type != nullptr) {
|
||||||
delete type;
|
delete type;
|
||||||
}
|
}
|
||||||
if(message != NULL) {
|
|
||||||
|
if(message != nullptr) {
|
||||||
delete message;
|
delete message;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -77,9 +79,9 @@ SWGApiResponse::fromJson(QString &json) {
|
|||||||
|
|
||||||
void
|
void
|
||||||
SWGApiResponse::fromJsonObject(QJsonObject &pJson) {
|
SWGApiResponse::fromJsonObject(QJsonObject &pJson) {
|
||||||
setValue(&code, pJson["code"], "qint32", "");
|
::Swagger::setValue(&code, pJson["code"], "qint32", "");
|
||||||
setValue(&type, pJson["type"], "QString", "QString");
|
::Swagger::setValue(&type, pJson["type"], "QString", "QString");
|
||||||
setValue(&message, pJson["message"], "QString", "QString");
|
::Swagger::setValue(&message, pJson["message"], "QString", "QString");
|
||||||
}
|
}
|
||||||
|
|
||||||
QString
|
QString
|
||||||
@ -95,17 +97,12 @@ SWGApiResponse::asJson ()
|
|||||||
QJsonObject*
|
QJsonObject*
|
||||||
SWGApiResponse::asJsonObject() {
|
SWGApiResponse::asJsonObject() {
|
||||||
QJsonObject* obj = new QJsonObject();
|
QJsonObject* obj = new QJsonObject();
|
||||||
|
|
||||||
obj->insert("code", QJsonValue(code));
|
obj->insert("code", QJsonValue(code));
|
||||||
|
|
||||||
|
|
||||||
toJsonValue(QString("type"), type, obj, QString("QString"));
|
toJsonValue(QString("type"), type, obj, QString("QString"));
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
toJsonValue(QString("message"), message, obj, QString("QString"));
|
toJsonValue(QString("message"), message, obj, QString("QString"));
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
@ -56,15 +56,18 @@ public:
|
|||||||
|
|
||||||
qint32 getCode();
|
qint32 getCode();
|
||||||
void setCode(qint32 code);
|
void setCode(qint32 code);
|
||||||
QString* getType();
|
|
||||||
|
QString* getType();
|
||||||
void setType(QString* type);
|
void setType(QString* type);
|
||||||
QString* getMessage();
|
|
||||||
|
QString* getMessage();
|
||||||
void setMessage(QString* message);
|
void setMessage(QString* message);
|
||||||
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
qint32 code;
|
qint32 code;
|
||||||
QString* type;
|
QString* type;
|
||||||
QString* message;
|
QString* message;
|
||||||
};
|
};
|
||||||
|
|
||||||
} /* namespace Swagger */
|
} /* namespace Swagger */
|
||||||
|
@ -51,13 +51,14 @@ SWGCategory::~SWGCategory() {
|
|||||||
void
|
void
|
||||||
SWGCategory::init() {
|
SWGCategory::init() {
|
||||||
id = 0L;
|
id = 0L;
|
||||||
name = new QString("");
|
name = new QString("");
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
SWGCategory::cleanup() {
|
SWGCategory::cleanup() {
|
||||||
|
|
||||||
if(name != NULL) {
|
|
||||||
|
if(name != nullptr) {
|
||||||
delete name;
|
delete name;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -73,8 +74,8 @@ SWGCategory::fromJson(QString &json) {
|
|||||||
|
|
||||||
void
|
void
|
||||||
SWGCategory::fromJsonObject(QJsonObject &pJson) {
|
SWGCategory::fromJsonObject(QJsonObject &pJson) {
|
||||||
setValue(&id, pJson["id"], "qint64", "");
|
::Swagger::setValue(&id, pJson["id"], "qint64", "");
|
||||||
setValue(&name, pJson["name"], "QString", "QString");
|
::Swagger::setValue(&name, pJson["name"], "QString", "QString");
|
||||||
}
|
}
|
||||||
|
|
||||||
QString
|
QString
|
||||||
@ -90,12 +91,10 @@ SWGCategory::asJson ()
|
|||||||
QJsonObject*
|
QJsonObject*
|
||||||
SWGCategory::asJsonObject() {
|
SWGCategory::asJsonObject() {
|
||||||
QJsonObject* obj = new QJsonObject();
|
QJsonObject* obj = new QJsonObject();
|
||||||
|
|
||||||
obj->insert("id", QJsonValue(id));
|
obj->insert("id", QJsonValue(id));
|
||||||
|
|
||||||
|
|
||||||
toJsonValue(QString("name"), name, obj, QString("QString"));
|
toJsonValue(QString("name"), name, obj, QString("QString"));
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
@ -56,12 +56,14 @@ public:
|
|||||||
|
|
||||||
qint64 getId();
|
qint64 getId();
|
||||||
void setId(qint64 id);
|
void setId(qint64 id);
|
||||||
QString* getName();
|
|
||||||
|
QString* getName();
|
||||||
void setName(QString* name);
|
void setName(QString* name);
|
||||||
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
qint64 id;
|
qint64 id;
|
||||||
QString* name;
|
QString* name;
|
||||||
};
|
};
|
||||||
|
|
||||||
} /* namespace Swagger */
|
} /* namespace Swagger */
|
||||||
|
@ -33,7 +33,7 @@ namespace Swagger {
|
|||||||
|
|
||||||
void
|
void
|
||||||
setValue(void* value, QJsonValue obj, QString type, QString complexType) {
|
setValue(void* value, QJsonValue obj, QString type, QString complexType) {
|
||||||
if(value == NULL) {
|
if(value == nullptr) {
|
||||||
// can't set value with a null pointer
|
// can't set value with a null pointer
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -60,7 +60,7 @@ setValue(void* value, QJsonValue obj, QString type, QString complexType) {
|
|||||||
else if (QStringLiteral("QString").compare(type) == 0) {
|
else if (QStringLiteral("QString").compare(type) == 0) {
|
||||||
QString **val = static_cast<QString**>(value);
|
QString **val = static_cast<QString**>(value);
|
||||||
|
|
||||||
if(val != NULL) {
|
if(val != nullptr) {
|
||||||
if(!obj.isNull()) {
|
if(!obj.isNull()) {
|
||||||
// create a new value and return
|
// create a new value and return
|
||||||
delete *val;
|
delete *val;
|
||||||
@ -68,19 +68,19 @@ setValue(void* value, QJsonValue obj, QString type, QString complexType) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
// set target to NULL
|
// set target to nullptr
|
||||||
delete *val;
|
delete *val;
|
||||||
*val = NULL;
|
*val = nullptr;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
qDebug() << "Can't set value because the target pointer is NULL";
|
qDebug() << "Can't set value because the target pointer is nullptr";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (QStringLiteral("QDateTime").compare(type) == 0) {
|
else if (QStringLiteral("QDateTime").compare(type) == 0) {
|
||||||
QDateTime **val = static_cast<QDateTime**>(value);
|
QDateTime **val = static_cast<QDateTime**>(value);
|
||||||
|
|
||||||
if(val != NULL) {
|
if(val != nullptr) {
|
||||||
if(!obj.isNull()) {
|
if(!obj.isNull()) {
|
||||||
// create a new value and return
|
// create a new value and return
|
||||||
delete *val;
|
delete *val;
|
||||||
@ -88,19 +88,19 @@ setValue(void* value, QJsonValue obj, QString type, QString complexType) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
// set target to NULL
|
// set target to nullptr
|
||||||
delete *val;
|
delete *val;
|
||||||
*val = NULL;
|
*val = nullptr;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
qDebug() << "Can't set value because the target pointer is NULL";
|
qDebug() << "Can't set value because the target pointer is nullptr";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (QStringLiteral("QDate").compare(type) == 0) {
|
else if (QStringLiteral("QDate").compare(type) == 0) {
|
||||||
QDate **val = static_cast<QDate**>(value);
|
QDate **val = static_cast<QDate**>(value);
|
||||||
|
|
||||||
if(val != NULL) {
|
if(val != nullptr) {
|
||||||
if(!obj.isNull()) {
|
if(!obj.isNull()) {
|
||||||
// create a new value and return
|
// create a new value and return
|
||||||
delete *val;
|
delete *val;
|
||||||
@ -108,19 +108,19 @@ setValue(void* value, QJsonValue obj, QString type, QString complexType) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
// set target to NULL
|
// set target to nullptr
|
||||||
delete *val;
|
delete *val;
|
||||||
*val = NULL;
|
*val = nullptr;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
qDebug() << "Can't set value because the target pointer is NULL";
|
qDebug() << "Can't set value because the target pointer is nullptr";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (QStringLiteral("QByteArray").compare(type) == 0) {
|
else if (QStringLiteral("QByteArray").compare(type) == 0) {
|
||||||
QByteArray **val = static_cast<QByteArray**>(value);
|
QByteArray **val = static_cast<QByteArray**>(value);
|
||||||
|
|
||||||
if(val != NULL) {
|
if(val != nullptr) {
|
||||||
if(!obj.isNull()) {
|
if(!obj.isNull()) {
|
||||||
// create a new value and return
|
// create a new value and return
|
||||||
delete *val;
|
delete *val;
|
||||||
@ -129,20 +129,20 @@ setValue(void* value, QJsonValue obj, QString type, QString complexType) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
// set target to NULL
|
// set target to nullptr
|
||||||
delete *val;
|
delete *val;
|
||||||
*val = NULL;
|
*val = nullptr;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
qDebug() << "Can't set value because the target pointer is NULL";
|
qDebug() << "Can't set value because the target pointer is nullptr";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if(type.startsWith("SWG") && obj.isObject()) {
|
else if(type.startsWith("SWG") && obj.isObject()) {
|
||||||
// complex type
|
// complex type
|
||||||
QJsonObject jsonObj = obj.toObject();
|
QJsonObject jsonObj = obj.toObject();
|
||||||
SWGObject * so = (SWGObject*)Swagger::create(type);
|
SWGObject * so = (SWGObject*)Swagger::create(type);
|
||||||
if(so != NULL) {
|
if(so != nullptr) {
|
||||||
so->fromJsonObject(jsonObj);
|
so->fromJsonObject(jsonObj);
|
||||||
SWGObject **val = static_cast<SWGObject**>(value);
|
SWGObject **val = static_cast<SWGObject**>(value);
|
||||||
delete *val;
|
delete *val;
|
||||||
@ -190,19 +190,19 @@ setValue(void* value, QJsonValue obj, QString type, QString complexType) {
|
|||||||
output->append((void*)&val);
|
output->append((void*)&val);
|
||||||
}
|
}
|
||||||
else if(QStringLiteral("QString").compare(complexType) == 0) {
|
else if(QStringLiteral("QString").compare(complexType) == 0) {
|
||||||
QString val;
|
QString * val = new QString();
|
||||||
setValue(&val, jval, QStringLiteral("QString"), QStringLiteral(""));
|
setValue(&val, jval, QStringLiteral("QString"), QStringLiteral(""));
|
||||||
output->append((void*)&val);
|
output->append((void*)val);
|
||||||
}
|
}
|
||||||
else if(QStringLiteral("QDate").compare(complexType) == 0) {
|
else if(QStringLiteral("QDate").compare(complexType) == 0) {
|
||||||
QDate val;
|
QDate * val = new QDate();
|
||||||
setValue(&val, jval, QStringLiteral("QDate"), QStringLiteral(""));
|
setValue(&val, jval, QStringLiteral("QDate"), QStringLiteral(""));
|
||||||
output->append((void*)&val);
|
output->append((void*)val);
|
||||||
}
|
}
|
||||||
else if(QStringLiteral("QDateTime").compare(complexType) == 0) {
|
else if(QStringLiteral("QDateTime").compare(complexType) == 0) {
|
||||||
QDateTime val;
|
QDateTime * val = new QDateTime();
|
||||||
setValue(&val, jval, QStringLiteral("QDateTime"), QStringLiteral(""));
|
setValue(&val, jval, QStringLiteral("QDateTime"), QStringLiteral(""));
|
||||||
output->append((void*)&val);
|
output->append((void*)val);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -214,14 +214,14 @@ setValue(void* value, QJsonValue obj, QString type, QString complexType) {
|
|||||||
|
|
||||||
void
|
void
|
||||||
toJsonValue(QString name, void* value, QJsonObject* output, QString type) {
|
toJsonValue(QString name, void* value, QJsonObject* output, QString type) {
|
||||||
if(value == NULL) {
|
if(value == nullptr) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if(type.startsWith("SWG")) {
|
if(type.startsWith("SWG")) {
|
||||||
SWGObject *swgObject = reinterpret_cast<SWGObject *>(value);
|
SWGObject *swgObject = reinterpret_cast<SWGObject *>(value);
|
||||||
if(swgObject != NULL) {
|
if(swgObject != nullptr) {
|
||||||
QJsonObject* o = (*swgObject).asJsonObject();
|
QJsonObject* o = (*swgObject).asJsonObject();
|
||||||
if(name != NULL) {
|
if(name != nullptr) {
|
||||||
output->insert(name, *o);
|
output->insert(name, *o);
|
||||||
delete o;
|
delete o;
|
||||||
}
|
}
|
||||||
@ -276,7 +276,7 @@ toJsonArray(QList<void*>* value, QJsonArray* output, QString innerName, QString
|
|||||||
foreach(void* obj, *value) {
|
foreach(void* obj, *value) {
|
||||||
QJsonObject element;
|
QJsonObject element;
|
||||||
|
|
||||||
toJsonValue(NULL, obj, &element, innerType);
|
toJsonValue(nullptr, obj, &element, innerType);
|
||||||
output->append(element);
|
output->append(element);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -60,7 +60,7 @@ void HttpRequestInput::add_file(QString variable_name, QString local_filename, Q
|
|||||||
|
|
||||||
|
|
||||||
HttpRequestWorker::HttpRequestWorker(QObject *parent)
|
HttpRequestWorker::HttpRequestWorker(QObject *parent)
|
||||||
: QObject(parent), manager(NULL)
|
: QObject(parent), manager(nullptr)
|
||||||
{
|
{
|
||||||
qsrand(QDateTime::currentDateTime().toTime_t());
|
qsrand(QDateTime::currentDateTime().toTime_t());
|
||||||
|
|
||||||
@ -204,8 +204,8 @@ void HttpRequestWorker::execute(HttpRequestInput *input) {
|
|||||||
|
|
||||||
// ensure necessary variables are available
|
// ensure necessary variables are available
|
||||||
if (
|
if (
|
||||||
file_info->local_filename == NULL || file_info->local_filename.isEmpty()
|
file_info->local_filename == nullptr || file_info->local_filename.isEmpty()
|
||||||
|| file_info->variable_name == NULL || file_info->variable_name.isEmpty()
|
|| file_info->variable_name == nullptr || file_info->variable_name.isEmpty()
|
||||||
|| !fi.exists() || !fi.isFile() || !fi.isReadable()
|
|| !fi.exists() || !fi.isFile() || !fi.isReadable()
|
||||||
) {
|
) {
|
||||||
// silent abort for the current file
|
// silent abort for the current file
|
||||||
@ -219,7 +219,7 @@ void HttpRequestWorker::execute(HttpRequestInput *input) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// ensure filename for the request
|
// ensure filename for the request
|
||||||
if (file_info->request_filename == NULL || file_info->request_filename.isEmpty()) {
|
if (file_info->request_filename == nullptr || file_info->request_filename.isEmpty()) {
|
||||||
file_info->request_filename = fi.fileName();
|
file_info->request_filename = fi.fileName();
|
||||||
if (file_info->request_filename.isEmpty()) {
|
if (file_info->request_filename.isEmpty()) {
|
||||||
file_info->request_filename = "file";
|
file_info->request_filename = "file";
|
||||||
@ -238,7 +238,7 @@ void HttpRequestWorker::execute(HttpRequestInput *input) {
|
|||||||
));
|
));
|
||||||
request_content.append(new_line);
|
request_content.append(new_line);
|
||||||
|
|
||||||
if (file_info->mime_type != NULL && !file_info->mime_type.isEmpty()) {
|
if (file_info->mime_type != nullptr && !file_info->mime_type.isEmpty()) {
|
||||||
request_content.append("Content-Type: ");
|
request_content.append("Content-Type: ");
|
||||||
request_content.append(file_info->mime_type);
|
request_content.append(file_info->mime_type);
|
||||||
request_content.append(new_line);
|
request_content.append(new_line);
|
||||||
|
@ -54,19 +54,19 @@ namespace Swagger {
|
|||||||
return new SWGUser();
|
return new SWGUser();
|
||||||
}
|
}
|
||||||
|
|
||||||
return NULL;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
inline void* create(QString json, QString type) {
|
inline void* create(QString json, QString type) {
|
||||||
void* val = create(type);
|
void* val = create(type);
|
||||||
if(val != NULL) {
|
if(val != nullptr) {
|
||||||
SWGObject* obj = static_cast<SWGObject*>(val);
|
SWGObject* obj = static_cast<SWGObject*>(val);
|
||||||
return obj->fromJson(json);
|
return obj->fromJson(json);
|
||||||
}
|
}
|
||||||
if(type.startsWith("QString")) {
|
if(type.startsWith("QString")) {
|
||||||
return new QString();
|
return new QString();
|
||||||
}
|
}
|
||||||
return NULL;
|
return nullptr;
|
||||||
}
|
}
|
||||||
} /* namespace Swagger */
|
} /* namespace Swagger */
|
||||||
|
|
||||||
|
@ -30,12 +30,12 @@
|
|||||||
class SWGObject {
|
class SWGObject {
|
||||||
public:
|
public:
|
||||||
virtual QJsonObject* asJsonObject() {
|
virtual QJsonObject* asJsonObject() {
|
||||||
return NULL;
|
return nullptr;
|
||||||
}
|
}
|
||||||
virtual ~SWGObject() {}
|
virtual ~SWGObject() {}
|
||||||
virtual SWGObject* fromJson(QString &jsonString) {
|
virtual SWGObject* fromJson(QString &jsonString) {
|
||||||
Q_UNUSED(jsonString);
|
Q_UNUSED(jsonString);
|
||||||
return NULL;
|
return nullptr;
|
||||||
}
|
}
|
||||||
virtual void fromJsonObject(QJsonObject &json) {
|
virtual void fromJsonObject(QJsonObject &json) {
|
||||||
Q_UNUSED(json);
|
Q_UNUSED(json);
|
||||||
|
@ -51,11 +51,11 @@ SWGOrder::~SWGOrder() {
|
|||||||
void
|
void
|
||||||
SWGOrder::init() {
|
SWGOrder::init() {
|
||||||
id = 0L;
|
id = 0L;
|
||||||
pet_id = 0L;
|
pet_id = 0L;
|
||||||
quantity = 0;
|
quantity = 0;
|
||||||
ship_date = NULL;
|
ship_date = NULL;
|
||||||
status = new QString("");
|
status = new QString("");
|
||||||
complete = false;
|
complete = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@ -63,10 +63,12 @@ SWGOrder::cleanup() {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
if(ship_date != NULL) {
|
|
||||||
|
if(ship_date != nullptr) {
|
||||||
delete ship_date;
|
delete ship_date;
|
||||||
}
|
}
|
||||||
if(status != NULL) {
|
|
||||||
|
if(status != nullptr) {
|
||||||
delete status;
|
delete status;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -83,12 +85,12 @@ SWGOrder::fromJson(QString &json) {
|
|||||||
|
|
||||||
void
|
void
|
||||||
SWGOrder::fromJsonObject(QJsonObject &pJson) {
|
SWGOrder::fromJsonObject(QJsonObject &pJson) {
|
||||||
setValue(&id, pJson["id"], "qint64", "");
|
::Swagger::setValue(&id, pJson["id"], "qint64", "");
|
||||||
setValue(&pet_id, pJson["pet_id"], "qint64", "");
|
::Swagger::setValue(&pet_id, pJson["pet_id"], "qint64", "");
|
||||||
setValue(&quantity, pJson["quantity"], "qint32", "");
|
::Swagger::setValue(&quantity, pJson["quantity"], "qint32", "");
|
||||||
setValue(&ship_date, pJson["ship_date"], "QDateTime", "QDateTime");
|
::Swagger::setValue(&ship_date, pJson["ship_date"], "QDateTime", "QDateTime");
|
||||||
setValue(&status, pJson["status"], "QString", "QString");
|
::Swagger::setValue(&status, pJson["status"], "QString", "QString");
|
||||||
setValue(&complete, pJson["complete"], "bool", "");
|
::Swagger::setValue(&complete, pJson["complete"], "bool", "");
|
||||||
}
|
}
|
||||||
|
|
||||||
QString
|
QString
|
||||||
@ -104,20 +106,18 @@ SWGOrder::asJson ()
|
|||||||
QJsonObject*
|
QJsonObject*
|
||||||
SWGOrder::asJsonObject() {
|
SWGOrder::asJsonObject() {
|
||||||
QJsonObject* obj = new QJsonObject();
|
QJsonObject* obj = new QJsonObject();
|
||||||
|
|
||||||
obj->insert("id", QJsonValue(id));
|
obj->insert("id", QJsonValue(id));
|
||||||
obj->insert("pet_id", QJsonValue(pet_id));
|
|
||||||
obj->insert("quantity", QJsonValue(quantity));
|
|
||||||
|
|
||||||
|
obj->insert("pet_id", QJsonValue(pet_id));
|
||||||
|
|
||||||
|
obj->insert("quantity", QJsonValue(quantity));
|
||||||
|
|
||||||
toJsonValue(QString("ship_date"), ship_date, obj, QString("QDateTime"));
|
toJsonValue(QString("ship_date"), ship_date, obj, QString("QDateTime"));
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
toJsonValue(QString("status"), status, obj, QString("QString"));
|
toJsonValue(QString("status"), status, obj, QString("QString"));
|
||||||
|
|
||||||
|
obj->insert("complete", QJsonValue(complete));
|
||||||
obj->insert("complete", QJsonValue(complete));
|
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
@ -57,24 +57,30 @@ public:
|
|||||||
|
|
||||||
qint64 getId();
|
qint64 getId();
|
||||||
void setId(qint64 id);
|
void setId(qint64 id);
|
||||||
qint64 getPetId();
|
|
||||||
|
qint64 getPetId();
|
||||||
void setPetId(qint64 pet_id);
|
void setPetId(qint64 pet_id);
|
||||||
qint32 getQuantity();
|
|
||||||
|
qint32 getQuantity();
|
||||||
void setQuantity(qint32 quantity);
|
void setQuantity(qint32 quantity);
|
||||||
QDateTime* getShipDate();
|
|
||||||
|
QDateTime* getShipDate();
|
||||||
void setShipDate(QDateTime* ship_date);
|
void setShipDate(QDateTime* ship_date);
|
||||||
QString* getStatus();
|
|
||||||
|
QString* getStatus();
|
||||||
void setStatus(QString* status);
|
void setStatus(QString* status);
|
||||||
bool getComplete();
|
|
||||||
|
bool getComplete();
|
||||||
void setComplete(bool complete);
|
void setComplete(bool complete);
|
||||||
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
qint64 id;
|
qint64 id;
|
||||||
qint64 pet_id;
|
qint64 pet_id;
|
||||||
qint32 quantity;
|
qint32 quantity;
|
||||||
QDateTime* ship_date;
|
QDateTime* ship_date;
|
||||||
QString* status;
|
QString* status;
|
||||||
bool complete;
|
bool complete;
|
||||||
};
|
};
|
||||||
|
|
||||||
} /* namespace Swagger */
|
} /* namespace Swagger */
|
||||||
|
@ -51,37 +51,42 @@ SWGPet::~SWGPet() {
|
|||||||
void
|
void
|
||||||
SWGPet::init() {
|
SWGPet::init() {
|
||||||
id = 0L;
|
id = 0L;
|
||||||
category = new SWGCategory();
|
category = new SWGCategory();
|
||||||
name = new QString("");
|
name = new QString("");
|
||||||
photo_urls = new QList<QString*>();
|
photo_urls = new QList<QString*>();
|
||||||
tags = new QList<SWGTag*>();
|
tags = new QList<SWGTag*>();
|
||||||
status = new QString("");
|
status = new QString("");
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
SWGPet::cleanup() {
|
SWGPet::cleanup() {
|
||||||
|
|
||||||
if(category != NULL) {
|
|
||||||
|
if(category != nullptr) {
|
||||||
delete category;
|
delete category;
|
||||||
}
|
}
|
||||||
if(name != NULL) {
|
|
||||||
|
if(name != nullptr) {
|
||||||
delete name;
|
delete name;
|
||||||
}
|
}
|
||||||
if(photo_urls != NULL) {
|
|
||||||
|
if(photo_urls != nullptr) {
|
||||||
QList<QString*>* arr = photo_urls;
|
QList<QString*>* arr = photo_urls;
|
||||||
foreach(QString* o, *arr) {
|
foreach(QString* o, *arr) {
|
||||||
delete o;
|
delete o;
|
||||||
}
|
}
|
||||||
delete photo_urls;
|
delete photo_urls;
|
||||||
}
|
}
|
||||||
if(tags != NULL) {
|
|
||||||
|
if(tags != nullptr) {
|
||||||
QList<SWGTag*>* arr = tags;
|
QList<SWGTag*>* arr = tags;
|
||||||
foreach(SWGTag* o, *arr) {
|
foreach(SWGTag* o, *arr) {
|
||||||
delete o;
|
delete o;
|
||||||
}
|
}
|
||||||
delete tags;
|
delete tags;
|
||||||
}
|
}
|
||||||
if(status != NULL) {
|
|
||||||
|
if(status != nullptr) {
|
||||||
delete status;
|
delete status;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -97,12 +102,16 @@ SWGPet::fromJson(QString &json) {
|
|||||||
|
|
||||||
void
|
void
|
||||||
SWGPet::fromJsonObject(QJsonObject &pJson) {
|
SWGPet::fromJsonObject(QJsonObject &pJson) {
|
||||||
setValue(&id, pJson["id"], "qint64", "");
|
::Swagger::setValue(&id, pJson["id"], "qint64", "");
|
||||||
setValue(&category, pJson["category"], "SWGCategory", "SWGCategory");
|
::Swagger::setValue(&category, pJson["category"], "SWGCategory", "SWGCategory");
|
||||||
setValue(&name, pJson["name"], "QString", "QString");
|
::Swagger::setValue(&name, pJson["name"], "QString", "QString");
|
||||||
setValue(&photo_urls, pJson["photo_urls"], "QList", "QString");
|
|
||||||
setValue(&tags, pJson["tags"], "QList", "SWGTag");
|
::Swagger::setValue(&photo_urls, pJson["photo_urls"], "QList", "QString");
|
||||||
setValue(&status, pJson["status"], "QString", "QString");
|
|
||||||
|
|
||||||
|
::Swagger::setValue(&tags, pJson["tags"], "QList", "SWGTag");
|
||||||
|
|
||||||
|
::Swagger::setValue(&status, pJson["status"], "QString", "QString");
|
||||||
}
|
}
|
||||||
|
|
||||||
QString
|
QString
|
||||||
@ -118,38 +127,22 @@ SWGPet::asJson ()
|
|||||||
QJsonObject*
|
QJsonObject*
|
||||||
SWGPet::asJsonObject() {
|
SWGPet::asJsonObject() {
|
||||||
QJsonObject* obj = new QJsonObject();
|
QJsonObject* obj = new QJsonObject();
|
||||||
|
|
||||||
obj->insert("id", QJsonValue(id));
|
obj->insert("id", QJsonValue(id));
|
||||||
|
|
||||||
|
|
||||||
toJsonValue(QString("category"), category, obj, QString("SWGCategory"));
|
toJsonValue(QString("category"), category, obj, QString("SWGCategory"));
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
toJsonValue(QString("name"), name, obj, QString("QString"));
|
toJsonValue(QString("name"), name, obj, QString("QString"));
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
QList<QString*>* photo_urlsList = photo_urls;
|
|
||||||
QJsonArray photo_urlsJsonArray;
|
QJsonArray photo_urlsJsonArray;
|
||||||
toJsonArray((QList<void*>*)photo_urls, &photo_urlsJsonArray, "photo_urls", "QString");
|
toJsonArray((QList<void*>*)photo_urls, &photo_urlsJsonArray, "photo_urls", "QString");
|
||||||
|
|
||||||
obj->insert("photo_urls", photo_urlsJsonArray);
|
obj->insert("photo_urls", photo_urlsJsonArray);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
QList<SWGTag*>* tagsList = tags;
|
|
||||||
QJsonArray tagsJsonArray;
|
QJsonArray tagsJsonArray;
|
||||||
toJsonArray((QList<void*>*)tags, &tagsJsonArray, "tags", "SWGTag");
|
toJsonArray((QList<void*>*)tags, &tagsJsonArray, "tags", "SWGTag");
|
||||||
|
|
||||||
obj->insert("tags", tagsJsonArray);
|
obj->insert("tags", tagsJsonArray);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
toJsonValue(QString("status"), status, obj, QString("QString"));
|
toJsonValue(QString("status"), status, obj, QString("QString"));
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
@ -59,24 +59,30 @@ public:
|
|||||||
|
|
||||||
qint64 getId();
|
qint64 getId();
|
||||||
void setId(qint64 id);
|
void setId(qint64 id);
|
||||||
SWGCategory* getCategory();
|
|
||||||
|
SWGCategory* getCategory();
|
||||||
void setCategory(SWGCategory* category);
|
void setCategory(SWGCategory* category);
|
||||||
QString* getName();
|
|
||||||
|
QString* getName();
|
||||||
void setName(QString* name);
|
void setName(QString* name);
|
||||||
QList<QString*>* getPhotoUrls();
|
|
||||||
|
QList<QString*>* getPhotoUrls();
|
||||||
void setPhotoUrls(QList<QString*>* photo_urls);
|
void setPhotoUrls(QList<QString*>* photo_urls);
|
||||||
QList<SWGTag*>* getTags();
|
|
||||||
|
QList<SWGTag*>* getTags();
|
||||||
void setTags(QList<SWGTag*>* tags);
|
void setTags(QList<SWGTag*>* tags);
|
||||||
QString* getStatus();
|
|
||||||
|
QString* getStatus();
|
||||||
void setStatus(QString* status);
|
void setStatus(QString* status);
|
||||||
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
qint64 id;
|
qint64 id;
|
||||||
SWGCategory* category;
|
SWGCategory* category;
|
||||||
QString* name;
|
QString* name;
|
||||||
QList<QString*>* photo_urls;
|
QList<QString*>* photo_urls;
|
||||||
QList<SWGTag*>* tags;
|
QList<SWGTag*>* tags;
|
||||||
QString* status;
|
QString* status;
|
||||||
};
|
};
|
||||||
|
|
||||||
} /* namespace Swagger */
|
} /* namespace Swagger */
|
||||||
|
@ -411,10 +411,10 @@ SWGPetApi::updatePetWithForm(qint64 pet_id, QString* name, QString* status) {
|
|||||||
HttpRequestWorker *worker = new HttpRequestWorker();
|
HttpRequestWorker *worker = new HttpRequestWorker();
|
||||||
HttpRequestInput input(fullPath, "POST");
|
HttpRequestInput input(fullPath, "POST");
|
||||||
|
|
||||||
if (name != NULL) {
|
if (name != nullptr) {
|
||||||
input.add_var("name", *name);
|
input.add_var("name", *name);
|
||||||
}
|
}
|
||||||
if (status != NULL) {
|
if (status != nullptr) {
|
||||||
input.add_var("status", *status);
|
input.add_var("status", *status);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -458,10 +458,10 @@ SWGPetApi::uploadFile(qint64 pet_id, QString* additional_metadata, SWGHttpReques
|
|||||||
HttpRequestWorker *worker = new HttpRequestWorker();
|
HttpRequestWorker *worker = new HttpRequestWorker();
|
||||||
HttpRequestInput input(fullPath, "POST");
|
HttpRequestInput input(fullPath, "POST");
|
||||||
|
|
||||||
if (additional_metadata != NULL) {
|
if (additional_metadata != nullptr) {
|
||||||
input.add_var("additionalMetadata", *additional_metadata);
|
input.add_var("additionalMetadata", *additional_metadata);
|
||||||
}
|
}
|
||||||
if (file != NULL) {
|
if (file != nullptr) {
|
||||||
input.add_file("file", (*file).local_filename, (*file).request_filename, (*file).mime_type);
|
input.add_file("file", (*file).local_filename, (*file).request_filename, (*file).mime_type);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -51,13 +51,14 @@ SWGTag::~SWGTag() {
|
|||||||
void
|
void
|
||||||
SWGTag::init() {
|
SWGTag::init() {
|
||||||
id = 0L;
|
id = 0L;
|
||||||
name = new QString("");
|
name = new QString("");
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
SWGTag::cleanup() {
|
SWGTag::cleanup() {
|
||||||
|
|
||||||
if(name != NULL) {
|
|
||||||
|
if(name != nullptr) {
|
||||||
delete name;
|
delete name;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -73,8 +74,8 @@ SWGTag::fromJson(QString &json) {
|
|||||||
|
|
||||||
void
|
void
|
||||||
SWGTag::fromJsonObject(QJsonObject &pJson) {
|
SWGTag::fromJsonObject(QJsonObject &pJson) {
|
||||||
setValue(&id, pJson["id"], "qint64", "");
|
::Swagger::setValue(&id, pJson["id"], "qint64", "");
|
||||||
setValue(&name, pJson["name"], "QString", "QString");
|
::Swagger::setValue(&name, pJson["name"], "QString", "QString");
|
||||||
}
|
}
|
||||||
|
|
||||||
QString
|
QString
|
||||||
@ -90,12 +91,10 @@ SWGTag::asJson ()
|
|||||||
QJsonObject*
|
QJsonObject*
|
||||||
SWGTag::asJsonObject() {
|
SWGTag::asJsonObject() {
|
||||||
QJsonObject* obj = new QJsonObject();
|
QJsonObject* obj = new QJsonObject();
|
||||||
|
|
||||||
obj->insert("id", QJsonValue(id));
|
obj->insert("id", QJsonValue(id));
|
||||||
|
|
||||||
|
|
||||||
toJsonValue(QString("name"), name, obj, QString("QString"));
|
toJsonValue(QString("name"), name, obj, QString("QString"));
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
@ -56,12 +56,14 @@ public:
|
|||||||
|
|
||||||
qint64 getId();
|
qint64 getId();
|
||||||
void setId(qint64 id);
|
void setId(qint64 id);
|
||||||
QString* getName();
|
|
||||||
|
QString* getName();
|
||||||
void setName(QString* name);
|
void setName(QString* name);
|
||||||
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
qint64 id;
|
qint64 id;
|
||||||
QString* name;
|
QString* name;
|
||||||
};
|
};
|
||||||
|
|
||||||
} /* namespace Swagger */
|
} /* namespace Swagger */
|
||||||
|
@ -51,34 +51,40 @@ SWGUser::~SWGUser() {
|
|||||||
void
|
void
|
||||||
SWGUser::init() {
|
SWGUser::init() {
|
||||||
id = 0L;
|
id = 0L;
|
||||||
username = new QString("");
|
username = new QString("");
|
||||||
first_name = new QString("");
|
first_name = new QString("");
|
||||||
last_name = new QString("");
|
last_name = new QString("");
|
||||||
email = new QString("");
|
email = new QString("");
|
||||||
password = new QString("");
|
password = new QString("");
|
||||||
phone = new QString("");
|
phone = new QString("");
|
||||||
user_status = 0;
|
user_status = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
SWGUser::cleanup() {
|
SWGUser::cleanup() {
|
||||||
|
|
||||||
if(username != NULL) {
|
|
||||||
|
if(username != nullptr) {
|
||||||
delete username;
|
delete username;
|
||||||
}
|
}
|
||||||
if(first_name != NULL) {
|
|
||||||
|
if(first_name != nullptr) {
|
||||||
delete first_name;
|
delete first_name;
|
||||||
}
|
}
|
||||||
if(last_name != NULL) {
|
|
||||||
|
if(last_name != nullptr) {
|
||||||
delete last_name;
|
delete last_name;
|
||||||
}
|
}
|
||||||
if(email != NULL) {
|
|
||||||
|
if(email != nullptr) {
|
||||||
delete email;
|
delete email;
|
||||||
}
|
}
|
||||||
if(password != NULL) {
|
|
||||||
|
if(password != nullptr) {
|
||||||
delete password;
|
delete password;
|
||||||
}
|
}
|
||||||
if(phone != NULL) {
|
|
||||||
|
if(phone != nullptr) {
|
||||||
delete phone;
|
delete phone;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -95,14 +101,14 @@ SWGUser::fromJson(QString &json) {
|
|||||||
|
|
||||||
void
|
void
|
||||||
SWGUser::fromJsonObject(QJsonObject &pJson) {
|
SWGUser::fromJsonObject(QJsonObject &pJson) {
|
||||||
setValue(&id, pJson["id"], "qint64", "");
|
::Swagger::setValue(&id, pJson["id"], "qint64", "");
|
||||||
setValue(&username, pJson["username"], "QString", "QString");
|
::Swagger::setValue(&username, pJson["username"], "QString", "QString");
|
||||||
setValue(&first_name, pJson["first_name"], "QString", "QString");
|
::Swagger::setValue(&first_name, pJson["first_name"], "QString", "QString");
|
||||||
setValue(&last_name, pJson["last_name"], "QString", "QString");
|
::Swagger::setValue(&last_name, pJson["last_name"], "QString", "QString");
|
||||||
setValue(&email, pJson["email"], "QString", "QString");
|
::Swagger::setValue(&email, pJson["email"], "QString", "QString");
|
||||||
setValue(&password, pJson["password"], "QString", "QString");
|
::Swagger::setValue(&password, pJson["password"], "QString", "QString");
|
||||||
setValue(&phone, pJson["phone"], "QString", "QString");
|
::Swagger::setValue(&phone, pJson["phone"], "QString", "QString");
|
||||||
setValue(&user_status, pJson["user_status"], "qint32", "");
|
::Swagger::setValue(&user_status, pJson["user_status"], "qint32", "");
|
||||||
}
|
}
|
||||||
|
|
||||||
QString
|
QString
|
||||||
@ -118,38 +124,22 @@ SWGUser::asJson ()
|
|||||||
QJsonObject*
|
QJsonObject*
|
||||||
SWGUser::asJsonObject() {
|
SWGUser::asJsonObject() {
|
||||||
QJsonObject* obj = new QJsonObject();
|
QJsonObject* obj = new QJsonObject();
|
||||||
|
|
||||||
obj->insert("id", QJsonValue(id));
|
obj->insert("id", QJsonValue(id));
|
||||||
|
|
||||||
|
|
||||||
toJsonValue(QString("username"), username, obj, QString("QString"));
|
toJsonValue(QString("username"), username, obj, QString("QString"));
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
toJsonValue(QString("first_name"), first_name, obj, QString("QString"));
|
toJsonValue(QString("first_name"), first_name, obj, QString("QString"));
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
toJsonValue(QString("last_name"), last_name, obj, QString("QString"));
|
toJsonValue(QString("last_name"), last_name, obj, QString("QString"));
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
toJsonValue(QString("email"), email, obj, QString("QString"));
|
toJsonValue(QString("email"), email, obj, QString("QString"));
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
toJsonValue(QString("password"), password, obj, QString("QString"));
|
toJsonValue(QString("password"), password, obj, QString("QString"));
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
toJsonValue(QString("phone"), phone, obj, QString("QString"));
|
toJsonValue(QString("phone"), phone, obj, QString("QString"));
|
||||||
|
|
||||||
|
obj->insert("user_status", QJsonValue(user_status));
|
||||||
obj->insert("user_status", QJsonValue(user_status));
|
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
@ -56,30 +56,38 @@ public:
|
|||||||
|
|
||||||
qint64 getId();
|
qint64 getId();
|
||||||
void setId(qint64 id);
|
void setId(qint64 id);
|
||||||
QString* getUsername();
|
|
||||||
|
QString* getUsername();
|
||||||
void setUsername(QString* username);
|
void setUsername(QString* username);
|
||||||
QString* getFirstName();
|
|
||||||
|
QString* getFirstName();
|
||||||
void setFirstName(QString* first_name);
|
void setFirstName(QString* first_name);
|
||||||
QString* getLastName();
|
|
||||||
|
QString* getLastName();
|
||||||
void setLastName(QString* last_name);
|
void setLastName(QString* last_name);
|
||||||
QString* getEmail();
|
|
||||||
|
QString* getEmail();
|
||||||
void setEmail(QString* email);
|
void setEmail(QString* email);
|
||||||
QString* getPassword();
|
|
||||||
|
QString* getPassword();
|
||||||
void setPassword(QString* password);
|
void setPassword(QString* password);
|
||||||
QString* getPhone();
|
|
||||||
|
QString* getPhone();
|
||||||
void setPhone(QString* phone);
|
void setPhone(QString* phone);
|
||||||
qint32 getUserStatus();
|
|
||||||
|
qint32 getUserStatus();
|
||||||
void setUserStatus(qint32 user_status);
|
void setUserStatus(qint32 user_status);
|
||||||
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
qint64 id;
|
qint64 id;
|
||||||
QString* username;
|
QString* username;
|
||||||
QString* first_name;
|
QString* first_name;
|
||||||
QString* last_name;
|
QString* last_name;
|
||||||
QString* email;
|
QString* email;
|
||||||
QString* password;
|
QString* password;
|
||||||
QString* phone;
|
QString* phone;
|
||||||
qint32 user_status;
|
qint32 user_status;
|
||||||
};
|
};
|
||||||
|
|
||||||
} /* namespace Swagger */
|
} /* namespace Swagger */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user