feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlJS Rewriter: Unify method names

Browse Source 
changeProperty->changeBinding
removeProperty->removeBindingByName
This commit is contained in:
Kai Koehne
2010-07-21 13:17:44 +02:00
parent 74e8027a7b
commit 35e787e61c
3 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libs/qmljs/qmljsrewriter.cpp
View File

@@ -229,10 +229,10 @@ QString Rewriter::flatten(UiQualifiedId *first)
return flatId;
}
void Rewriter::changeProperty(UiObjectInitializer *ast,
const QString &propertyName,
const QString &newValue,
BindingType binding)
void Rewriter::changeBinding(UiObjectInitializer *ast,
const QString &propertyName,
const QString &newValue,
BindingType binding)
{
QString prefix, suffix;
int dotIdx = propertyName.indexOf(QLatin1Char('.'));
@@ -269,7 +269,7 @@ void Rewriter::changeProperty(UiObjectInitializer *ast,
else if (!prefix.isEmpty()) {
if (UiObjectDefinition *def = cast<UiObjectDefinition *>(member)) {
if (flatten(def->qualifiedTypeNameId) == prefix) {
changeProperty(def->initializer, suffix, newValue, binding);
changeBinding(def->initializer, suffix, newValue, binding);
}
}
}
@@ -357,7 +357,7 @@ void Rewriter::insertIntoArray(UiArrayBinding *ast, const QString &newValue)
m_changeSet->insert(insertionPoint, QLatin1String(",\n") + newValue);
}
void Rewriter::removeProperty(UiObjectInitializer *ast, const QString &propertyName)
void Rewriter::removeBindingByName(UiObjectInitializer *ast, const QString &propertyName)
{
QString prefix;
int dotIdx = propertyName.indexOf(QLatin1Char('.'));

27
src/libs/qmljs/qmljsrewriter.h
View File

@@ -55,27 +55,30 @@ public:
const QStringList &propertyOrder);
Range addBinding(AST::UiObjectInitializer *ast,
const QString &propertyName,
const QString &propertyValue,
BindingType bindingType);
const QString &propertyName,
const QString &propertyValue,
BindingType bindingType);
Range addBinding(AST::UiObjectInitializer *ast,
const QString &propertyName,
const QString &propertyValue,
BindingType bindingType,
AST::UiObjectMemberList *insertAfter);
const QString &propertyName,
const QString &propertyValue,
BindingType bindingType,
AST::UiObjectMemberList *insertAfter);
void changeProperty(AST::UiObjectInitializer *ast,
const QString &propertyName,
const QString &newValue,
BindingType binding);
void changeBinding(AST::UiObjectInitializer *ast,
const QString &propertyName,
const QString &newValue,
BindingType binding);
void removeProperty(AST::UiObjectInitializer *ast, const QString &propertyName);
void removeBindingByName(AST::UiObjectInitializer *ast, const QString &propertyName);
void appendToArrayBinding(AST::UiArrayBinding *arrayBinding,
const QString &content);
Range addObject(AST::UiObjectInitializer *ast, const QString &content);
Range 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);