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/components/formeditor/formeditorscene.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/components/formeditor/formeditorscene.cpp')
-rw-r--r-- | src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp index e0b9453bc2..1cda0c1c09 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp @@ -264,9 +264,8 @@ QList<QGraphicsItem *> FormEditorScene::removeLayerItems(const QList<QGraphicsIt void FormEditorScene::mousePressEvent(QGraphicsSceneMouseEvent *event) { - if (editorView() && editorView()->model()) { + if (editorView() && editorView()->model()) currentTool()->mousePressEvent(removeLayerItems(items(event->scenePos())), event); - } } static QTime staticTimer() @@ -311,16 +310,14 @@ void FormEditorScene::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) void FormEditorScene::keyPressEvent(QKeyEvent *keyEvent) { - if (editorView() && editorView()->model()) { + if (editorView() && editorView()->model()) currentTool()->keyPressEvent(keyEvent); - } } void FormEditorScene::keyReleaseEvent(QKeyEvent *keyEvent) { - if (editorView() && editorView()->model()) { + if (editorView() && editorView()->model()) currentTool()->keyReleaseEvent(keyEvent); - } } FormEditorView *FormEditorScene::editorView() const @@ -401,9 +398,8 @@ void FormEditorScene::clearFormEditorItems() QList<QGraphicsItem*> itemList(items()); foreach (QGraphicsItem *item, itemList) { - if (qgraphicsitem_cast<FormEditorItem* >(item)) { + if (qgraphicsitem_cast<FormEditorItem* >(item)) item->setParentItem(0); - } } foreach (QGraphicsItem *item, itemList) { |