Mercurial > projects > qtd

diff generator/abstractmetabuilder.cpp @ 380:beb04f46ef4a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix NULL default values
author Eldar Insafutdinov
date Sat, 10 Jul 2010 22:32:16 +0100
parents 18bd68f586c6
children 1049b01aebd2
line wrap: on
line diff
--- a/generator/abstractmetabuilder.cpp	Sat Jul 10 22:16:33 2010 +0100
+++ b/generator/abstractmetabuilder.cpp	Sat Jul 10 22:32:16 2010 +0100
@@ -2024,7 +2024,7 @@
         if (expr == "QVariant()" /* qtd || expr == "QModelIndex()"*/) {
             return "null";
         } else if (expr == "QString()") {
-            return "null";
+            return "\"\"";
         } else if (expr.endsWith(")") && expr.contains("::")) {
             TypeEntry *typeEntry = TypeDatabase::instance()->findType(expr.left(expr.indexOf("::")));
             if (typeEntry)
@@ -2040,7 +2040,7 @@
                     return "new " + typeEntry->qualifiedCppName() + expr.right(expr.length() - pos);
             } else
                 return expr;
-        } else if (expr == "0") {
+        } else if (expr == "0" || expr == "NULL") {
             return "null";
         } else if (type->isObject() || type->isValue() || expr.contains("::")) { // like Qt::black passed to a QColor
             TypeEntry *typeEntry = TypeDatabase::instance()->findType(expr.left(expr.indexOf("::")));