From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Mon, 1 Aug 2011 14:48:33 +0000 (+0200)
Subject: Compile.
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=11698ec98d8ef21a5c079c602903c8ab183aa9f7;p=konrad%2Fqtdeclarative.git

Compile.

Change-Id: Id8af2a65e54317a9300289a034c042d59b2c69bd
Reviewed-on: http://codereview.qt.nokia.com/3776
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
---

diff --git a/src/declarative/util/qdeclarativelistmodel.cpp b/src/declarative/util/qdeclarativelistmodel.cpp
index da841c1..531209c 100644
--- a/src/declarative/util/qdeclarativelistmodel.cpp
+++ b/src/declarative/util/qdeclarativelistmodel.cpp
@@ -847,14 +847,14 @@ bool QDeclarativeListModelParser::compileProperty(const QDeclarativeCustomParser
                         AST::StringLiteral *literal = 0;
                         if (AST::CallExpression *callExpr = AST::cast<AST::CallExpression *>(node)) {
                             if (AST::IdentifierExpression *idExpr = AST::cast<AST::IdentifierExpression *>(callExpr->base)) {
-                                if (idExpr->name->asString() == QLatin1String("QT_TR_NOOP")) {
+                                if (idExpr->name == QLatin1String("QT_TR_NOOP")) {
                                     if (callExpr->arguments && !callExpr->arguments->next)
                                         literal = AST::cast<AST::StringLiteral *>(callExpr->arguments->expression);
                                     if (!literal) {
                                         error(prop, QDeclarativeListModel::tr("ListElement: improperly specified QT_TR_NOOP"));
                                         return false;
                                     }
-                                } else if (idExpr->name->asString() == QLatin1String("QT_TRANSLATE_NOOP")) {
+                                } else if (idExpr->name == QLatin1String("QT_TRANSLATE_NOOP")) {
                                     if (callExpr->arguments && callExpr->arguments->next && !callExpr->arguments->next->next)
                                         literal = AST::cast<AST::StringLiteral *>(callExpr->arguments->next->expression);
                                     if (!literal) {
@@ -867,7 +867,7 @@ bool QDeclarativeListModelParser::compileProperty(const QDeclarativeCustomParser
 
                         if (literal) {
                             d[0] = char(QDeclarativeParser::Variant::String);
-                            d += literal->value->asString().toUtf8();
+                            d += literal->value.toUtf8();
                         } else {
                             error(prop, QDeclarativeListModel::tr("ListElement: cannot use script for property value"));
                             return false;