diff --git a/src/libs/qmljs/qmljsrewriter.cpp b/src/libs/qmljs/qmljsrewriter.cpp index 23a1c11508601ad276dd9ebf11748b4fba209eca..7586f74f4c2d92fe4885dc1f5a09bf83d9c64237 100644 --- a/src/libs/qmljs/qmljsrewriter.cpp +++ b/src/libs/qmljs/qmljsrewriter.cpp @@ -52,16 +52,23 @@ Rewriter::Rewriter(const QString &originalText, Q_ASSERT(changeSet); } +void Rewriter::addBinding(AST::UiObjectInitializer *ast, + const QString &propertyName, + const QString &propertyValue, + BindingType bindingType) +{ + UiObjectMemberList *insertAfter = searchMemberToInsertAfter(ast->members, + propertyName, + m_propertyOrder); + addBinding(ast, propertyName, propertyValue, bindingType, insertAfter); +} + void Rewriter::addBinding(AST::UiObjectInitializer *ast, const QString &propertyName, const QString &propertyValue, BindingType bindingType, UiObjectMemberList *insertAfter) { - if (!insertAfter) - insertAfter = searchMemberToInsertAfter(ast->members, - propertyName, - m_propertyOrder); SourceLocation endOfPreviousMember; SourceLocation startOfNextMember; @@ -570,11 +577,14 @@ void Rewriter::appendToArrayBinding(UiArrayBinding *arrayBinding, m_changeSet->insert(insertionPoint, QLatin1String(",\n") + content); } -void Rewriter::addObject(UiObjectInitializer *ast, const QString &content, UiObjectMemberList *insertAfter) +void Rewriter::addObject(UiObjectInitializer *ast, const QString &content) { - if (!insertAfter) - insertAfter = searchMemberToInsertAfter(ast->members, m_propertyOrder); + UiObjectMemberList *insertAfter = searchMemberToInsertAfter(ast->members, m_propertyOrder); + addObject(ast, content, insertAfter); +} +void Rewriter::addObject(UiObjectInitializer *ast, const QString &content, UiObjectMemberList *insertAfter) +{ int insertionPoint; QString textToInsert; if (insertAfter && insertAfter->member) { diff --git a/src/libs/qmljs/qmljsrewriter.h b/src/libs/qmljs/qmljsrewriter.h index d2ad8e6113a8f2d34f6808bc07c6cadc403fbac1..95f3d4011210394643dcfc2586cb039587a7028f 100644 --- a/src/libs/qmljs/qmljsrewriter.h +++ b/src/libs/qmljs/qmljsrewriter.h @@ -56,11 +56,16 @@ public: Utils::ChangeSet *changeSet, const QStringList &propertyOrder); + void addBinding(AST::UiObjectInitializer *ast, + const QString &propertyName, + const QString &propertyValue, + BindingType bindingType); + void addBinding(AST::UiObjectInitializer *ast, const QString &propertyName, const QString &propertyValue, BindingType bindingType, - AST::UiObjectMemberList *insertAfter = 0); + AST::UiObjectMemberList *insertAfter); void changeProperty(AST::UiObjectInitializer *ast, const QString &propertyName, @@ -71,7 +76,8 @@ public: void appendToArrayBinding(AST::UiArrayBinding *arrayBinding, const QString &content); - void addObject(AST::UiObjectInitializer *ast, const QString &content, AST::UiObjectMemberList *insertAfter = 0); + void addObject(AST::UiObjectInitializer *ast, const QString &content); + void addObject(AST::UiObjectInitializer *ast, const QString &content, AST::UiObjectMemberList *insertAfter); void removeObjectMember(AST::UiObjectMember *member, AST::UiObjectMember *parent); static AST::UiObjectMemberList *searchMemberToInsertAfter(AST::UiObjectMemberList *members, const QStringList &propertyOrder);