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/qtsupport/qmldumptool.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/qtsupport/qmldumptool.cpp')
-rw-r--r-- | src/plugins/qtsupport/qmldumptool.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/qtsupport/qmldumptool.cpp b/src/plugins/qtsupport/qmldumptool.cpp index 488ed409d2..f7af7993e3 100644 --- a/src/plugins/qtsupport/qmldumptool.cpp +++ b/src/plugins/qtsupport/qmldumptool.cpp @@ -121,9 +121,8 @@ private slots: } } - if (m_failed) { + if (m_failed) qWarning("%s", qPrintable(errorMessage)); - } // update qmldump path for all the project QmlJS::ModelManagerInterface *modelManager = QmlJS::ModelManagerInterface::instance(); @@ -295,9 +294,8 @@ QString QmlDumpTool::copy(const QString &qtInstallData, QString *errorMessage) // Try to find a writeable directory. foreach (const QString &directory, directories) { - if (copyFiles(sourcePath(), sourceFileNames(), directory, errorMessage)) { + if (copyFiles(sourcePath(), sourceFileNames(), directory, errorMessage)) return directory; - } } *errorMessage = QCoreApplication::translate("ProjectExplorer::QmlDumpTool", "qmldump could not be built in any of the directories:\n- %1\n\nReason: %2") |