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/qmlprofiler/canvas/qdeclarativecanvastimer.cpp | |
| parent | 73a2717bed511cffd0163195c314f7d919e5128b (diff) | |
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/qmlprofiler/canvas/qdeclarativecanvastimer.cpp')
| -rw-r--r-- | src/plugins/qmlprofiler/canvas/qdeclarativecanvastimer.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/qmlprofiler/canvas/qdeclarativecanvastimer.cpp b/src/plugins/qmlprofiler/canvas/qdeclarativecanvastimer.cpp index 6c7d05ba59..37370c9e9b 100644 --- a/src/plugins/qmlprofiler/canvas/qdeclarativecanvastimer.cpp +++ b/src/plugins/qmlprofiler/canvas/qdeclarativecanvastimer.cpp @@ -46,9 +46,8 @@ void CanvasTimer::handleTimeout() { Q_ASSERT(m_value.isFunction()); m_value.call(); - if (isSingleShot()) { + if (isSingleShot()) removeTimer(this); - } } void CanvasTimer::createTimer(QObject *parent, const QScriptValue &val, long timeout, bool singleshot) |