Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Qt5/C++] Arrays of primitive types fix #4046

Merged
merged 3 commits into from
Oct 22, 2016
Merged

[Qt5/C++] Arrays of primitive types fix #4046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a792b68
Corrects issue #3410 when trying to create Arrays of primitive types
marache Oct 21, 2016
0c701b3
Use c++11 nullptr keyword and various indentation issues resolved
marache Oct 21, 2016
1a873fa
ran petstore on new mustaches
marache Oct 21, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions modules/swagger-codegen/src/main/resources/qt5cpp/HttpRequest.cpp.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ void HttpRequestInput::add_file(QString variable_name, QString local_filename, Q


HttpRequestWorker::HttpRequestWorker(QObject *parent)
: QObject(parent), manager(NULL)
: QObject(parent), manager(nullptr)
{
qsrand(QDateTime::currentDateTime().toTime_t());

Expand Down Expand Up @@ -181,8 +181,8 @@ void HttpRequestWorker::execute(HttpRequestInput *input) {

// ensure necessary variables are available
if (
file_info->local_filename == NULL || file_info->local_filename.isEmpty()
|| file_info->variable_name == NULL || file_info->variable_name.isEmpty()
file_info->local_filename == nullptr || file_info->local_filename.isEmpty()
|| file_info->variable_name == nullptr || file_info->variable_name.isEmpty()
|| !fi.exists() || !fi.isFile() || !fi.isReadable()
) {
// silent abort for the current file
Expand All @@ -196,7 +196,7 @@ void HttpRequestWorker::execute(HttpRequestInput *input) {
}

// 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();
if (file_info->request_filename.isEmpty()) {
file_info->request_filename = "file";
Expand All @@ -215,7 +215,7 @@ void HttpRequestWorker::execute(HttpRequestInput *input) {
));
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(file_info->mime_type);
request_content.append(new_line);
Expand Down
2 changes: 1 addition & 1 deletion modules/swagger-codegen/src/main/resources/qt5cpp/api-body.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ void
HttpRequestWorker *worker = new HttpRequestWorker();
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}}
}
{{/formParams}}
Expand Down
56 changes: 28 additions & 28 deletions modules/swagger-codegen/src/main/resources/qt5cpp/helpers-body.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ namespace Swagger {

void
setValue(void* value, QJsonValue obj, QString type, QString complexType) {
if(value == NULL) {
if(value == nullptr) {
// can't set value with a null pointer
return;
}
Expand All @@ -37,67 +37,67 @@ setValue(void* value, QJsonValue obj, QString type, QString complexType) {
else if (QStringLiteral("QString").compare(type) == 0) {
QString **val = static_cast<QString**>(value);

if(val != NULL) {
if(val != nullptr) {
if(!obj.isNull()) {
// create a new value and return
delete *val;
*val = new QString(obj.toString());
return;
}
else {
// set target to NULL
// set target to nullptr
delete *val;
*val = NULL;
*val = nullptr;
}
}
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) {
QDateTime **val = static_cast<QDateTime**>(value);

if(val != NULL) {
if(val != nullptr) {
if(!obj.isNull()) {
// create a new value and return
delete *val;
*val = new QDateTime(QDateTime::fromString(obj.toString(), Qt::ISODate));
return;
}
else {
// set target to NULL
// set target to nullptr
delete *val;
*val = NULL;
*val = nullptr;
}
}
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) {
QDate **val = static_cast<QDate**>(value);

if(val != NULL) {
if(val != nullptr) {
if(!obj.isNull()) {
// create a new value and return
delete *val;
*val = new QDate(QDate::fromString(obj.toString(), Qt::ISODate));
return;
}
else {
// set target to NULL
// set target to nullptr
delete *val;
*val = NULL;
*val = nullptr;
}
}
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) {
QByteArray **val = static_cast<QByteArray**>(value);

if(val != NULL) {
if(val != nullptr) {
if(!obj.isNull()) {
// create a new value and return
delete *val;
Expand All @@ -106,20 +106,20 @@ setValue(void* value, QJsonValue obj, QString type, QString complexType) {
return;
}
else {
// set target to NULL
// set target to nullptr
delete *val;
*val = NULL;
*val = nullptr;
}
}
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()) {
// complex type
QJsonObject jsonObj = obj.toObject();
SWGObject * so = (SWGObject*)Swagger::create(type);
if(so != NULL) {
if(so != nullptr) {
so->fromJsonObject(jsonObj);
SWGObject **val = static_cast<SWGObject**>(value);
delete *val;
Expand Down Expand Up @@ -167,19 +167,19 @@ setValue(void* value, QJsonValue obj, QString type, QString complexType) {
output->append((void*)&val);
}
else if(QStringLiteral("QString").compare(complexType) == 0) {
QString val;
QString * val = new QString();
setValue(&val, jval, QStringLiteral("QString"), QStringLiteral(""));
output->append((void*)&val);
output->append((void*)val);
}
else if(QStringLiteral("QDate").compare(complexType) == 0) {
QDate val;
QDate * val = new QDate();
setValue(&val, jval, QStringLiteral("QDate"), QStringLiteral(""));
output->append((void*)&val);
output->append((void*)val);
}
else if(QStringLiteral("QDateTime").compare(complexType) == 0) {
QDateTime val;
QDateTime * val = new QDateTime();
setValue(&val, jval, QStringLiteral("QDateTime"), QStringLiteral(""));
output->append((void*)&val);
output->append((void*)val);
}
}
}
Expand All @@ -191,14 +191,14 @@ setValue(void* value, QJsonValue obj, QString type, QString complexType) {

void
toJsonValue(QString name, void* value, QJsonObject* output, QString type) {
if(value == NULL) {
if(value == nullptr) {
return;
}
if(type.startsWith("SWG")) {
SWGObject *swgObject = reinterpret_cast<SWGObject *>(value);
if(swgObject != NULL) {
if(swgObject != nullptr) {
QJsonObject* o = (*swgObject).asJsonObject();
if(name != NULL) {
if(name != nullptr) {
output->insert(name, *o);
delete o;
}
Expand Down Expand Up @@ -253,7 +253,7 @@ toJsonArray(QList<void*>* value, QJsonArray* output, QString innerName, QString
foreach(void* obj, *value) {
QJsonObject element;

toJsonValue(NULL, obj, &element, innerType);
toJsonValue(nullptr, obj, &element, innerType);
output->append(element);
}
}
Expand Down
36 changes: 20 additions & 16 deletions modules/swagger-codegen/src/main/resources/qt5cpp/model-body.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,15 @@ namespace Swagger {

void
{{classname}}::init() {
{{#vars}}{{name}} = {{{defaultValue}}};
{{#vars}}
{{name}} = {{{defaultValue}}};
{{/vars}}
}

void
{{classname}}::cleanup() {
{{#vars}}{{#complexType}}if({{name}} != NULL) {
{{#vars}}{{#complexType}}
if({{name}} != nullptr) {
{{#isContainer}}QList<{{complexType}}*>* arr = {{name}};
foreach({{complexType}}* o, *arr) {
delete o;
Expand All @@ -54,7 +56,12 @@ void

void
{{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}}
}

Expand All @@ -71,21 +78,18 @@ QString
QJsonObject*
{{classname}}::asJsonObject() {
QJsonObject* obj = new QJsonObject();
{{#vars}}{{#complexType}}
{{^isContainer}}{{#complexType}}
toJsonValue(QString("{{name}}"), {{name}}, obj, QString("{{complexType}}"));
{{/complexType}}{{^complexType}}
else if({{name}} != NULL && *{{name}} != NULL) {
obj->insert("{{name}}", QJsonValue(*{{name}}));
}{{/complexType}}
{{/isContainer}}{{#isContainer}}
QList<{{complexType}}*>* {{name}}List = {{name}};
{{#vars}}{{#complexType}}{{^isContainer}}{{#complexType}}
toJsonValue(QString("{{name}}"), {{name}}, obj, QString("{{complexType}}"));{{/complexType}}{{^complexType}}
if({{name}} != nullptr && *{{name}} != nullptr) {
obj->insert("{{name}}", QJsonValue(*{{name}}));
}{{/complexType}}{{/isContainer}}{{#isContainer}}
QJsonArray {{name}}JsonArray;
toJsonArray((QList<void*>*){{name}}, &{{name}}JsonArray, "{{name}}", "{{complexType}}");

obj->insert("{{name}}", {{name}}JsonArray);
{{/isContainer}}
{{/complexType}}{{^complexType}}obj->insert("{{name}}", QJsonValue({{name}}));{{/complexType}}
obj->insert("{{name}}", {{name}}JsonArray);{{/isContainer}}{{/complexType}}{{^complexType}}{{^isContainer}}
obj->insert("{{name}}", QJsonValue({{name}}));{{/isContainer}}{{#isContainer}}
QJsonArray {{name}}JsonArray;
toJsonArray((QList<void*>*){{name}}, &{{name}}JsonArray, "{{name}}", "{{items.baseType}}");
obj->insert("{{name}}", {{name}}JsonArray);{{/isContainer}}{{/complexType}}
{{/vars}}

return obj;
Expand Down
7 changes: 5 additions & 2 deletions modules/swagger-codegen/src/main/resources/qt5cpp/model-header.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,15 @@ public:
void fromJsonObject(QJsonObject &json);
{{classname}}* fromJson(QString &jsonString);

{{#vars}}{{{datatype}}} {{getter}}();
{{#vars}}
{{{datatype}}} {{getter}}();
void {{setter}}({{{datatype}}} {{name}});

{{/vars}}

private:
{{#vars}}{{{datatype}}} {{name}};
{{#vars}}
{{{datatype}}} {{name}};
{{/vars}}
};

Expand Down
6 changes: 3 additions & 3 deletions modules/swagger-codegen/src/main/resources/qt5cpp/modelFactory.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@ namespace Swagger {
return new {{classname}}();
}
{{/model}}{{/models}}
return NULL;
return nullptr;
}

inline void* create(QString json, QString type) {
void* val = create(type);
if(val != NULL) {
if(val != nullptr) {
SWGObject* obj = static_cast<SWGObject*>(val);
return obj->fromJson(json);
}
if(type.startsWith("QString")) {
return new QString();
}
return NULL;
return nullptr;
}
} /* namespace Swagger */

Expand Down
4 changes: 2 additions & 2 deletions modules/swagger-codegen/src/main/resources/qt5cpp/object.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
class {{prefix}}Object {
public:
virtual QJsonObject* asJsonObject() {
return NULL;
return nullptr;
}
virtual ~SWGObject() {}
virtual SWGObject* fromJson(QString &jsonString) {
Q_UNUSED(jsonString);
return NULL;
return nullptr;
}
virtual void fromJsonObject(QJsonObject &json) {
Q_UNUSED(json);
Expand Down
23 changes: 10 additions & 13 deletions samples/client/petstore/qt5cpp/client/SWGApiResponse.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,17 +51,19 @@ SWGApiResponse::~SWGApiResponse() {
void
SWGApiResponse::init() {
code = 0;
type = new QString("");
message = new QString("");
type = new QString("");
message = new QString("");
}

void
SWGApiResponse::cleanup() {

if(type != NULL) {

if(type != nullptr) {
delete type;
}
if(message != NULL) {

if(message != nullptr) {
delete message;
}
}
Expand All @@ -77,9 +79,9 @@ SWGApiResponse::fromJson(QString &json) {

void
SWGApiResponse::fromJsonObject(QJsonObject &pJson) {
setValue(&code, pJson["code"], "qint32", "");
setValue(&type, pJson["type"], "QString", "QString");
setValue(&message, pJson["message"], "QString", "QString");
::Swagger::setValue(&code, pJson["code"], "qint32", "");
::Swagger::setValue(&type, pJson["type"], "QString", "QString");
::Swagger::setValue(&message, pJson["message"], "QString", "QString");
}

QString
Expand All @@ -95,17 +97,12 @@ SWGApiResponse::asJson ()
QJsonObject*
SWGApiResponse::asJsonObject() {
QJsonObject* obj = new QJsonObject();

obj->insert("code", QJsonValue(code));


toJsonValue(QString("type"), type, obj, QString("QString"));




toJsonValue(QString("message"), message, obj, QString("QString"));



return obj;
}
Expand Down
Loading