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/libs/qmleditorwidgets | |
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/libs/qmleditorwidgets')
-rw-r--r-- | src/libs/qmleditorwidgets/contextpanetextwidget.cpp | 15 | ||||
-rw-r--r-- | src/libs/qmleditorwidgets/contextpanewidgetrectangle.cpp | 3 |
2 files changed, 7 insertions, 11 deletions
diff --git a/src/libs/qmleditorwidgets/contextpanetextwidget.cpp b/src/libs/qmleditorwidgets/contextpanetextwidget.cpp index ffd700ceeb..74427d7a55 100644 --- a/src/libs/qmleditorwidgets/contextpanetextwidget.cpp +++ b/src/libs/qmleditorwidgets/contextpanetextwidget.cpp @@ -169,17 +169,15 @@ void ContextPaneTextWidget::setProperties(QmlJS::PropertyReader *propertyReader) ui->strikeoutButton->setChecked(false); } - if (propertyReader->hasProperty(QLatin1String("color"))) { + if (propertyReader->hasProperty(QLatin1String("color"))) ui->colorButton->setColor(propertyReader->readProperty(QLatin1String("color")).toString()); - } else { + else ui->colorButton->setColor(QLatin1String("black")); - } - if (propertyReader->hasProperty(QLatin1String("styleColor"))) { + if (propertyReader->hasProperty(QLatin1String("styleColor"))) ui->textColorButton->setColor(propertyReader->readProperty(QLatin1String("styleColor")).toString()); - } else { + else ui->textColorButton->setColor(QLatin1String("black")); - } if (propertyReader->hasProperty(QLatin1String("font.family"))) { QString familyName = propertyReader->readProperty(QLatin1String("font.family")).toString(); @@ -310,11 +308,10 @@ void ContextPaneTextWidget::onFontSizeChanged(int) void ContextPaneTextWidget::onFontFormatChanged() { int size = ui->fontSizeSpinBox->value(); - if (ui->fontSizeSpinBox->isPointSize()) { + if (ui->fontSizeSpinBox->isPointSize()) emit removeAndChangeProperty(QLatin1String("font.pixelSize"), QLatin1String("font.pointSize"), size, true); - } else { + else emit removeAndChangeProperty(QLatin1String("font.pointSize"), QLatin1String("font.pixelSize"), size, true); - } } diff --git a/src/libs/qmleditorwidgets/contextpanewidgetrectangle.cpp b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.cpp index ee9c4fbac5..8afbdaedfc 100644 --- a/src/libs/qmleditorwidgets/contextpanewidgetrectangle.cpp +++ b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.cpp @@ -231,9 +231,8 @@ void ContextPaneWidgetRectangle::onBorderNoneClicked() void ContextPaneWidgetRectangle::onBorderSolidClicked() { - if (ui->borderSolid->isChecked()) { + if (ui->borderSolid->isChecked()) emit propertyChanged(QLatin1String("border.color"), QLatin1String("\"black\"")); - } } void ContextPaneWidgetRectangle::onGradientLineDoubleClicked(const QPoint &p) |