Don't check _id if we don't need to

So it avoids warning with static analysis
woboq · Mar 13, 2017 · 87084cf · 87084cf
1 parent d1a5cd9
commit 87084cf
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/generator.cpp b/src/generator.cpp
@@ -741,9 +741,11 @@ void Generator::GenerateMetaCall()
     OS_TemplateHeader << "\n" << TemplatePrefix << "int " << QualName
         << "::qt_metacall(QMetaObject::Call _c, int _id, void **_a)\n{\n";
     if (!BaseName.empty()) {
-        OS_TemplateHeader << "    _id = " << BaseName << "::qt_metacall(_c, _id, _a);\n"
-              "    if (_id < 0)\n"
-              "        return _id;\n";
+        OS_TemplateHeader << "    _id = " << BaseName << "::qt_metacall(_c, _id, _a);\n";
+        if (MethodCount || CDef->Properties.size()) {
+            OS_TemplateHeader << "    if (_id < 0)\n"
+                                 "        return _id;\n";
+        };
     }
 
     if (MethodCount) {
@@ -809,7 +811,7 @@ void Generator::GenerateMetaCall()
         HandleQueryPropertyAction(needUser, "QueryPropertyUser", &PropertyDef::user);
 
     }
-    OS_TemplateHeader << "\n    return _id;"
+    OS_TemplateHeader << "\n    return _id;\n"
           "}\n";
 }