Cleanup generated code

Change-Id: I8e7d29072aa70942f5d9c9c0f0d05078b7f552ff
Reviewed-by: Brett Stottlemyer <bstottle@ford.com>

1 files changed, 10 insertions, 25 deletions

diff --git a/tools/repc/repcodegenerator.cpp b/tools/repc/repcodegenerator.cpp
index e9e7d18..fdb27d7 100644
--- a/tools/repc/repcodegenerator.cpp
+++ b/tools/repc/repcodegenerator.cpp
@@ -390,7 +390,11 @@ QString RepCodeGenerator::typeForMode(const ASTProperty &property, RepCodeGenera
 
 void RepCodeGenerator::generateSimpleSetter(QTextStream &out, const ASTProperty &property, bool generateOverride)
 {
-    out << "    virtual void set" << cap(property.name) << "(" << typeForMode(property, SIMPLE_SOURCE) << " " << property.name << ")";
+    if (!generateOverride)
+        out << "    virtual ";
+    else
+        out << "    ";
+    out << "void set" << cap(property.name) << "(" << typeForMode(property, SIMPLE_SOURCE) << " " << property.name << ")";
     if (generateOverride)
         out << " override";
     out << endl;
@@ -468,13 +472,8 @@ void RepCodeGenerator::generateDeclarationsForEnums(QTextStream &out, const QVec
 
         out << "    };" << endl;
 
-        if (generateQENUM) {
-            out << "#if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0))" << endl;
+        if (generateQENUM)
             out << "    Q_ENUM(" << en.name << ")" << endl;
-            out << "#else" << endl;
-            out << "    Q_ENUMS(" << en.name << ")" << endl;
-            out << "#endif" << endl;
-        }
     }
 }
 
@@ -492,13 +491,6 @@ void RepCodeGenerator::generateENUMs(QTextStream &out, const QVector<ASTEnum> &e
 
     out << "};\n\n";
 
-    if (!enums.isEmpty()) {
-        out << "#if (QT_VERSION < QT_VERSION_CHECK(5, 5, 0))\n";
-        for (const ASTEnum &en : enums)
-            out << "    Q_DECLARE_METATYPE(" << className <<"::" << en.name << ")\n";
-        out <<  "#endif\n\n";
-    }
-
     generateStreamOperatorsForEnums(out, enums, className);
 }
 
@@ -507,7 +499,7 @@ void RepCodeGenerator::generateConversionFunctionsForEnums(QTextStream &out, con
     for (const ASTEnum &en : enums)
     {
         const QString type = getEnumType(en);
-        out << "    static inline " << en.name << " to" << en.name << "(" << type << " i, bool *ok = 0)\n"
+        out << "    static inline " << en.name << " to" << en.name << "(" << type << " i, bool *ok = nullptr)\n"
                "    {\n"
                "        if (ok)\n"
                "            *ok = true;\n"
@@ -781,7 +773,7 @@ void RepCodeGenerator::generateClass(Mode mode, QTextStream &out, const ASTClass
     out << "public:" << endl;
 
     if (mode == REPLICA && astClass.hasPersisted) {
-        out << "    virtual ~" << className << "() {" << endl;
+        out << "    ~" << className << "() override {" << endl;
         out << "        QVariantList persisted;" << endl;
         for (int i = 0; i < astClass.properties.size(); i++) {
             if (astClass.properties.at(i).persisted) {
@@ -791,7 +783,7 @@ void RepCodeGenerator::generateClass(Mode mode, QTextStream &out, const ASTClass
         out << "        persistProperties(\"" << astClass.name << "\", \"" << classSignature(astClass) << "\", persisted);" << endl;
         out << "    }" << endl;
     } else {
-        out << "    virtual ~" << className << "() {}" << endl;
+        out << "    ~" << className << "() override = default;" << endl;
     }
     out << "" << endl;
 
@@ -966,15 +958,8 @@ void RepCodeGenerator::generateClass(Mode mode, QTextStream &out, const ASTClass
     out << "};" << endl;
     out << "" << endl;
 
-    if (mode != SIMPLE_SOURCE) {
-        out << "#if (QT_VERSION < QT_VERSION_CHECK(5, 5, 0))" << endl;
-        for (const ASTEnum &en : astClass.enums)
-            out << "    Q_DECLARE_METATYPE(" << className << "::" << en.name << ")" << endl;
-        out <<  "#endif" << endl;
-        out << "" << endl;
-
+    if (mode != SIMPLE_SOURCE)
         generateStreamOperatorsForEnums(out, astClass.enums, className);
-    }
 
     out << "" << endl;
 }