fixed return value

florianlink · florianlink · commit 8e76e20bafc9 · 2016-08-03T07:16:08.000Z
fixed wrong isValid negation
diff --git a/generator/abstractmetalang.cpp b/generator/abstractmetalang.cpp
@@ -855,7 +855,7 @@ QString AbstractMetaClass::getDefaultNonZeroFunction() const
       return "isNull";
     }
   }
-  return false;
+  return QString();
 }
 
 /*******************************************************************************
diff --git a/generator/shellheadergenerator.cpp b/generator/shellheadergenerator.cpp
@@ -397,7 +397,11 @@ void ShellHeaderGenerator::write(QTextStream &s, const AbstractMetaClass *meta_c
   }
   QString nonZeroFunc = meta_class->getDefaultNonZeroFunction();
   if (!nonZeroFunc.isEmpty()) {
-    s << "    bool __nonzero__(" << meta_class->qualifiedCppName() << "* obj) { return !obj->" << nonZeroFunc << "(); }" << endl; 
+    s << "    bool __nonzero__(" << meta_class->qualifiedCppName() << "* obj) { return ";
+    if (nonZeroFunc != "isValid") {
+      s << "!";
+    }
+    s << "obj->" << nonZeroFunc << "(); }" << endl;
   }
 
   AbstractMetaFieldList fields = meta_class->fields();

Original file line number	Diff line number	Diff line change
`@@ -855,7 +855,7 @@ QString AbstractMetaClass::getDefaultNonZeroFunction() const`
`855`	`855`	`return "isNull";`
`856`	`856`	`}`
`857`	`857`	`}`
`858`		`- return false;`
	`858`	`+ return QString();`
`859`	`859`	`}`
`860`	`860`
`861`	`861`	`/*******************************************************************************`
Original file line number	Diff line number	Diff line change
`@@ -397,7 +397,11 @@ void ShellHeaderGenerator::write(QTextStream &s, const AbstractMetaClass *meta_c`
`397`	`397`	`}`
`398`	`398`	`QString nonZeroFunc = meta_class->getDefaultNonZeroFunction();`
`399`	`399`	`if (!nonZeroFunc.isEmpty()) {`
`400`		`- s << " bool __nonzero__(" << meta_class->qualifiedCppName() << "* obj) { return !obj->" << nonZeroFunc << "(); }" << endl;`
	`400`	`+ s << " bool __nonzero__(" << meta_class->qualifiedCppName() << "* obj) { return ";`
	`401`	`+ if (nonZeroFunc != "isValid") {`
	`402`	`+ s << "!";`
	`403`	`+ }`
	`404`	`+ s << "obj->" << nonZeroFunc << "(); }" << endl;`
`401`	`405`	`}`
`402`	`406`
`403`	`407`	`AbstractMetaFieldList fields = meta_class->fields();`