From 7f01593b94b01dea688fc0b1caa6b01faf5c3c31 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Tue, 20 Jul 2010 15:26:24 +0200
Subject: [PATCH] Compile fix
---
src/libs/qmljs/qmljsrewriter.cpp | 2 +-
src/libs/qmljs/qmljsrewriter.h | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/libs/qmljs/qmljsrewriter.cpp b/src/libs/qmljs/qmljsrewriter.cpp
index e48fda894dc..23a1c115086 100644
--- a/src/libs/qmljs/qmljsrewriter.cpp
+++ b/src/libs/qmljs/qmljsrewriter.cpp
@@ -570,7 +570,7 @@ void Rewriter::appendToArrayBinding(UiArrayBinding *arrayBinding,
m_changeSet->insert(insertionPoint, QLatin1String(",\n") + content);
}
-void Rewriter::addObject(UiObjectInitializer *ast, const QString &content, UiObjectMemberList *insertAfter = 0)
+void Rewriter::addObject(UiObjectInitializer *ast, const QString &content, UiObjectMemberList *insertAfter)
{
if (!insertAfter)
insertAfter = searchMemberToInsertAfter(ast->members, m_propertyOrder);
diff --git a/src/libs/qmljs/qmljsrewriter.h b/src/libs/qmljs/qmljsrewriter.h
index fef26457748..d2ad8e6113a 100644
--- a/src/libs/qmljs/qmljsrewriter.h
+++ b/src/libs/qmljs/qmljsrewriter.h
@@ -60,7 +60,7 @@ public:
const QString &propertyName,
const QString &propertyValue,
BindingType bindingType,
- UiObjectMemberList *insertAfter = 0);
+ AST::UiObjectMemberList *insertAfter = 0);
void changeProperty(AST::UiObjectInitializer *ast,
const QString &propertyName,
@@ -71,7 +71,7 @@ public:
void appendToArrayBinding(AST::UiArrayBinding *arrayBinding,
const QString &content);
- void addObject(AST::UiObjectInitializer *ast, const QString &content, UiObjectMemberList *insertAfter = 0);
+ void addObject(AST::UiObjectInitializer *ast, const QString &content, AST::UiObjectMemberList *insertAfter = 0);
void removeObjectMember(AST::UiObjectMember *member, AST::UiObjectMember *parent);
static AST::UiObjectMemberList *searchMemberToInsertAfter(AST::UiObjectMemberList *members, const QStringList &propertyOrder);
--
GitLab