Cleanup

Author: YuriUfimtsev

generator/abstractmetabuilder.cpp

@@ -1973,7 +1973,7 @@ AbstractMetaType::shared_pointer AbstractMetaBuilder::inheritTemplateType(const
     if (returned->hasInstantiations()) {
         auto instantiations = returned->instantiations();
         for (int i=0; i<instantiations.count(); ++i) {
-            instantiations[i] = AbstractMetaType::shared_pointer(inheritTemplateType(template_types, instantiations[i], ok));
+            instantiations[i] = inheritTemplateType(template_types, instantiations[i], ok);
             if (ok != 0 && !(*ok))
                 return 0;
         }

generator/shellimplgenerator.cpp

@@ -123,7 +123,7 @@ void ShellImplGenerator::write(QTextStream &s, const AbstractMetaClass *meta_cla
 
     AbstractMetaFunctionList virtualsForShell = getVirtualFunctionsForShell(meta_class);
     foreach (const AbstractMetaFunction *fun, virtualsForShell) {
-      bool hasReturnValue = (fun->type());
+      bool hasReturnValue = !fun->type().isNull();
       writeFunctionSignature(s, fun, meta_class, QString(),
         Option(OriginalName | ShowStatic | UnderscoreSpaces | UseIndexedName),
         "PythonQtShell_");