diff options
author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2013-01-08 03:32:53 +0200 |
---|---|---|
committer | hjk <qthjk@ovi.com> | 2013-01-08 10:48:18 +0100 |
commit | 29a93998df8405e8799ad23934a56cd99fb36403 (patch) | |
tree | c0e4a341efeef78fbe530a618caaa50254daad59 /src/plugins/qmldesigner/designercore/model/paster.cpp | |
parent | 73a2717bed511cffd0163195c314f7d919e5128b (diff) | |
download | qt-creator-29a93998df8405e8799ad23934a56cd99fb36403.tar.gz |
Remove braces for single lines of conditions
#!/usr/bin/env ruby
Dir.glob('**/*.cpp') { |file|
# skip ast (excluding paste, astpath, and canv'ast'imer)
next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i
s = File.read(file)
next if s.include?('qlalr')
orig = s.dup
s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m|
res = $&
if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces
res
else
res.gsub!('} else', 'else')
res.gsub!(/\n +} *\n/m, "\n")
res.gsub(/ *{$/, '')
end
}
s.gsub!(/ *$/, '')
File.open(file, 'wb').write(s) if s != orig
}
Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc
Reviewed-by: hjk <qthjk@ovi.com>
Diffstat (limited to 'src/plugins/qmldesigner/designercore/model/paster.cpp')
-rw-r--r-- | src/plugins/qmldesigner/designercore/model/paster.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/plugins/qmldesigner/designercore/model/paster.cpp b/src/plugins/qmldesigner/designercore/model/paster.cpp index 4ac580e8ab..d7df3cce70 100644 --- a/src/plugins/qmldesigner/designercore/model/paster.cpp +++ b/src/plugins/qmldesigner/designercore/model/paster.cpp @@ -69,9 +69,8 @@ public: Node::accept(sourceAST->imports, this); - if (sourceAST->members && sourceAST->members->member) { + if (sourceAST->members && sourceAST->members->member) visitRootMember(sourceAST->members->member); - } return m_locations.isEmpty(); } @@ -136,18 +135,16 @@ protected: switchStateName(prevStateName); return false; } else if (ast->qualifiedTypeNameId && ast->qualifiedTypeNameId->name && ast->qualifiedTypeNameId->name->asString() == "PropertyChanges") { - if (m_locations.remove(toLocation(start, end))) { + if (m_locations.remove(toLocation(start, end))) m_paster->addNodeState(m_stateName, textAt(start, end)); - } return false; } else { return true; } } else { - if (m_locations.remove(toLocation(start, end))) { + if (m_locations.remove(toLocation(start, end))) m_paster->addNode(textAt(start, end)); - } return false; } @@ -171,9 +168,8 @@ protected: bool visit(UiScriptBinding *ast) { if (m_inStates && ast->qualifiedId && ast->qualifiedId->name && ast->qualifiedId->name->asString() == "name") { if (ExpressionStatement *stmt = AST::cast<ExpressionStatement *>(ast->statement)) { - if (StringLiteral * str = AST::cast<StringLiteral *>(stmt->expression)) { + if (StringLiteral * str = AST::cast<StringLiteral *>(stmt->expression)) m_stateName = str->value->asString(); - } } } |