From 651395d42689b408ffc080ecb89a098d16b6380d Mon Sep 17 00:00:00 2001
From: sunn <33183834+etherealjoy@users.noreply.github.com>
Date: Sun, 6 Jan 2019 18:20:23 +0100
Subject: [PATCH] Update base class due to failed compilation in case of plain
 object type with no properties or additionalProperties specified (#1826)

---
 .../resources/cpp-qt5-client/model-header.mustache     |  2 +-
 .../src/main/resources/cpp-qt5-client/object.mustache  | 10 +++++++++-
 .../cpp-qt5-qhttpengine-server/model-header.mustache   |  2 +-
 .../cpp-qt5-qhttpengine-server/object.mustache         | 10 +++++++++-
 .../client/petstore/cpp-qt5/client/OAIApiResponse.h    |  2 +-
 samples/client/petstore/cpp-qt5/client/OAICategory.h   |  2 +-
 samples/client/petstore/cpp-qt5/client/OAIObject.h     | 10 +++++++++-
 samples/client/petstore/cpp-qt5/client/OAIOrder.h      |  2 +-
 samples/client/petstore/cpp-qt5/client/OAIPet.h        |  2 +-
 samples/client/petstore/cpp-qt5/client/OAITag.h        |  2 +-
 samples/client/petstore/cpp-qt5/client/OAIUser.h       |  2 +-
 .../server/src/models/OAIApiResponse.h                 |  2 +-
 .../server/src/models/OAICategory.h                    |  2 +-
 .../server/src/models/OAIObject.h                      | 10 +++++++++-
 .../server/src/models/OAIOrder.h                       |  2 +-
 .../server/src/models/OAIPet.h                         |  2 +-
 .../server/src/models/OAITag.h                         |  2 +-
 .../server/src/models/OAIUser.h                        |  2 +-
 18 files changed, 50 insertions(+), 18 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-client/model-header.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/model-header.mustache
index f1feafe2cc2..c6e966d1996 100644
--- a/modules/openapi-generator/src/main/resources/cpp-qt5-client/model-header.mustache
+++ b/modules/openapi-generator/src/main/resources/cpp-qt5-client/model-header.mustache
@@ -27,7 +27,6 @@ public:
     {{classname}}();
     {{classname}}(QString json);
     ~{{classname}}() override;
-    void init();
 
     QString asJson () const override;
     QJsonObject asJsonObject() const override;
@@ -43,6 +42,7 @@ public:
     virtual bool isValid() const override;
 
 private:
+    void init();
     {{#vars}}
     {{{dataType}}} {{name}};
     bool m_{{name}}_isSet;
diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-client/object.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/object.mustache
index 86d39f41952..c0b2413118b 100644
--- a/modules/openapi-generator/src/main/resources/cpp-qt5-client/object.mustache
+++ b/modules/openapi-generator/src/main/resources/cpp-qt5-client/object.mustache
@@ -11,6 +11,14 @@ namespace {{this}} {
 
 class {{prefix}}Object {
   public:
+    {{prefix}}Object() {
+
+    }
+    
+    {{prefix}}Object(QString jsonString) {
+        fromJson(jsonString);
+    }
+
     virtual ~{{prefix}}Object(){
 
     }
@@ -41,7 +49,7 @@ class {{prefix}}Object {
         return true;
     }
 private :
-   QJsonObject jObj;
+    QJsonObject jObj;
 };
 
 {{#cppNamespaceDeclarations}}
diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/model-header.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/model-header.mustache
index f1feafe2cc2..c6e966d1996 100644
--- a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/model-header.mustache
+++ b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/model-header.mustache
@@ -27,7 +27,6 @@ public:
     {{classname}}();
     {{classname}}(QString json);
     ~{{classname}}() override;
-    void init();
 
     QString asJson () const override;
     QJsonObject asJsonObject() const override;
@@ -43,6 +42,7 @@ public:
     virtual bool isValid() const override;
 
 private:
+    void init();
     {{#vars}}
     {{{dataType}}} {{name}};
     bool m_{{name}}_isSet;
diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/object.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/object.mustache
index 86d39f41952..c0b2413118b 100644
--- a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/object.mustache
+++ b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/object.mustache
@@ -11,6 +11,14 @@ namespace {{this}} {
 
 class {{prefix}}Object {
   public:
+    {{prefix}}Object() {
+
+    }
+    
+    {{prefix}}Object(QString jsonString) {
+        fromJson(jsonString);
+    }
+
     virtual ~{{prefix}}Object(){
 
     }
@@ -41,7 +49,7 @@ class {{prefix}}Object {
         return true;
     }
 private :
-   QJsonObject jObj;
+    QJsonObject jObj;
 };
 
 {{#cppNamespaceDeclarations}}
diff --git a/samples/client/petstore/cpp-qt5/client/OAIApiResponse.h b/samples/client/petstore/cpp-qt5/client/OAIApiResponse.h
index acc008836b2..cf75b3988c6 100644
--- a/samples/client/petstore/cpp-qt5/client/OAIApiResponse.h
+++ b/samples/client/petstore/cpp-qt5/client/OAIApiResponse.h
@@ -33,7 +33,6 @@ public:
     OAIApiResponse();
     OAIApiResponse(QString json);
     ~OAIApiResponse() override;
-    void init();
 
     QString asJson () const override;
     QJsonObject asJsonObject() const override;
@@ -53,6 +52,7 @@ public:
     virtual bool isValid() const override;
 
 private:
+    void init();
     qint32 code;
     bool m_code_isSet;
     bool m_code_isValid;
diff --git a/samples/client/petstore/cpp-qt5/client/OAICategory.h b/samples/client/petstore/cpp-qt5/client/OAICategory.h
index 2b2f0b9a0e4..2d72ebfbd80 100644
--- a/samples/client/petstore/cpp-qt5/client/OAICategory.h
+++ b/samples/client/petstore/cpp-qt5/client/OAICategory.h
@@ -33,7 +33,6 @@ public:
     OAICategory();
     OAICategory(QString json);
     ~OAICategory() override;
-    void init();
 
     QString asJson () const override;
     QJsonObject asJsonObject() const override;
@@ -50,6 +49,7 @@ public:
     virtual bool isValid() const override;
 
 private:
+    void init();
     qint64 id;
     bool m_id_isSet;
     bool m_id_isValid;
diff --git a/samples/client/petstore/cpp-qt5/client/OAIObject.h b/samples/client/petstore/cpp-qt5/client/OAIObject.h
index 94ddea3af88..ce51fbf0493 100644
--- a/samples/client/petstore/cpp-qt5/client/OAIObject.h
+++ b/samples/client/petstore/cpp-qt5/client/OAIObject.h
@@ -20,6 +20,14 @@ namespace OpenAPI {
 
 class OAIObject {
   public:
+    OAIObject() {
+
+    }
+    
+    OAIObject(QString jsonString) {
+        fromJson(jsonString);
+    }
+
     virtual ~OAIObject(){
 
     }
@@ -50,7 +58,7 @@ class OAIObject {
         return true;
     }
 private :
-   QJsonObject jObj;
+    QJsonObject jObj;
 };
 
 }
diff --git a/samples/client/petstore/cpp-qt5/client/OAIOrder.h b/samples/client/petstore/cpp-qt5/client/OAIOrder.h
index 5937ef5a83e..c9550fb1df4 100644
--- a/samples/client/petstore/cpp-qt5/client/OAIOrder.h
+++ b/samples/client/petstore/cpp-qt5/client/OAIOrder.h
@@ -34,7 +34,6 @@ public:
     OAIOrder();
     OAIOrder(QString json);
     ~OAIOrder() override;
-    void init();
 
     QString asJson () const override;
     QJsonObject asJsonObject() const override;
@@ -63,6 +62,7 @@ public:
     virtual bool isValid() const override;
 
 private:
+    void init();
     qint64 id;
     bool m_id_isSet;
     bool m_id_isValid;
diff --git a/samples/client/petstore/cpp-qt5/client/OAIPet.h b/samples/client/petstore/cpp-qt5/client/OAIPet.h
index 28fc4b884ff..2ca79919a72 100644
--- a/samples/client/petstore/cpp-qt5/client/OAIPet.h
+++ b/samples/client/petstore/cpp-qt5/client/OAIPet.h
@@ -36,7 +36,6 @@ public:
     OAIPet();
     OAIPet(QString json);
     ~OAIPet() override;
-    void init();
 
     QString asJson () const override;
     QJsonObject asJsonObject() const override;
@@ -65,6 +64,7 @@ public:
     virtual bool isValid() const override;
 
 private:
+    void init();
     qint64 id;
     bool m_id_isSet;
     bool m_id_isValid;
diff --git a/samples/client/petstore/cpp-qt5/client/OAITag.h b/samples/client/petstore/cpp-qt5/client/OAITag.h
index ea2c79fef64..27f033928c4 100644
--- a/samples/client/petstore/cpp-qt5/client/OAITag.h
+++ b/samples/client/petstore/cpp-qt5/client/OAITag.h
@@ -33,7 +33,6 @@ public:
     OAITag();
     OAITag(QString json);
     ~OAITag() override;
-    void init();
 
     QString asJson () const override;
     QJsonObject asJsonObject() const override;
@@ -50,6 +49,7 @@ public:
     virtual bool isValid() const override;
 
 private:
+    void init();
     qint64 id;
     bool m_id_isSet;
     bool m_id_isValid;
diff --git a/samples/client/petstore/cpp-qt5/client/OAIUser.h b/samples/client/petstore/cpp-qt5/client/OAIUser.h
index 6fbb63832aa..275376c2dea 100644
--- a/samples/client/petstore/cpp-qt5/client/OAIUser.h
+++ b/samples/client/petstore/cpp-qt5/client/OAIUser.h
@@ -33,7 +33,6 @@ public:
     OAIUser();
     OAIUser(QString json);
     ~OAIUser() override;
-    void init();
 
     QString asJson () const override;
     QJsonObject asJsonObject() const override;
@@ -68,6 +67,7 @@ public:
     virtual bool isValid() const override;
 
 private:
+    void init();
     qint64 id;
     bool m_id_isSet;
     bool m_id_isValid;
diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIApiResponse.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIApiResponse.h
index acc008836b2..cf75b3988c6 100644
--- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIApiResponse.h
+++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIApiResponse.h
@@ -33,7 +33,6 @@ public:
     OAIApiResponse();
     OAIApiResponse(QString json);
     ~OAIApiResponse() override;
-    void init();
 
     QString asJson () const override;
     QJsonObject asJsonObject() const override;
@@ -53,6 +52,7 @@ public:
     virtual bool isValid() const override;
 
 private:
+    void init();
     qint32 code;
     bool m_code_isSet;
     bool m_code_isValid;
diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAICategory.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAICategory.h
index 2b2f0b9a0e4..2d72ebfbd80 100644
--- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAICategory.h
+++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAICategory.h
@@ -33,7 +33,6 @@ public:
     OAICategory();
     OAICategory(QString json);
     ~OAICategory() override;
-    void init();
 
     QString asJson () const override;
     QJsonObject asJsonObject() const override;
@@ -50,6 +49,7 @@ public:
     virtual bool isValid() const override;
 
 private:
+    void init();
     qint64 id;
     bool m_id_isSet;
     bool m_id_isValid;
diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIObject.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIObject.h
index 94ddea3af88..ce51fbf0493 100644
--- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIObject.h
+++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIObject.h
@@ -20,6 +20,14 @@ namespace OpenAPI {
 
 class OAIObject {
   public:
+    OAIObject() {
+
+    }
+    
+    OAIObject(QString jsonString) {
+        fromJson(jsonString);
+    }
+
     virtual ~OAIObject(){
 
     }
@@ -50,7 +58,7 @@ class OAIObject {
         return true;
     }
 private :
-   QJsonObject jObj;
+    QJsonObject jObj;
 };
 
 }
diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIOrder.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIOrder.h
index 5937ef5a83e..c9550fb1df4 100644
--- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIOrder.h
+++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIOrder.h
@@ -34,7 +34,6 @@ public:
     OAIOrder();
     OAIOrder(QString json);
     ~OAIOrder() override;
-    void init();
 
     QString asJson () const override;
     QJsonObject asJsonObject() const override;
@@ -63,6 +62,7 @@ public:
     virtual bool isValid() const override;
 
 private:
+    void init();
     qint64 id;
     bool m_id_isSet;
     bool m_id_isValid;
diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIPet.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIPet.h
index 28fc4b884ff..2ca79919a72 100644
--- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIPet.h
+++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIPet.h
@@ -36,7 +36,6 @@ public:
     OAIPet();
     OAIPet(QString json);
     ~OAIPet() override;
-    void init();
 
     QString asJson () const override;
     QJsonObject asJsonObject() const override;
@@ -65,6 +64,7 @@ public:
     virtual bool isValid() const override;
 
 private:
+    void init();
     qint64 id;
     bool m_id_isSet;
     bool m_id_isValid;
diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAITag.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAITag.h
index ea2c79fef64..27f033928c4 100644
--- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAITag.h
+++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAITag.h
@@ -33,7 +33,6 @@ public:
     OAITag();
     OAITag(QString json);
     ~OAITag() override;
-    void init();
 
     QString asJson () const override;
     QJsonObject asJsonObject() const override;
@@ -50,6 +49,7 @@ public:
     virtual bool isValid() const override;
 
 private:
+    void init();
     qint64 id;
     bool m_id_isSet;
     bool m_id_isValid;
diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIUser.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIUser.h
index 6fbb63832aa..275376c2dea 100644
--- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIUser.h
+++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIUser.h
@@ -33,7 +33,6 @@ public:
     OAIUser();
     OAIUser(QString json);
     ~OAIUser() override;
-    void init();
 
     QString asJson () const override;
     QJsonObject asJsonObject() const override;
@@ -68,6 +67,7 @@ public:
     virtual bool isValid() const override;
 
 private:
+    void init();
     qint64 id;
     bool m_id_isSet;
     bool m_id_isValid;