From 601ab660af07a11b1b394629a075c09828df1116 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Tue, 8 Jan 2013 03:32:53 +0200 Subject: 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 (cherry picked from qtcreator/29a93998df8405e8799ad23934a56cd99fb36403) Reviewed-by: Robin Burchell --- qmake/library/qmakeparser.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'qmake/library/qmakeparser.cpp') diff --git a/qmake/library/qmakeparser.cpp b/qmake/library/qmakeparser.cpp index 6641149941b..ce49caef114 100644 --- a/qmake/library/qmakeparser.cpp +++ b/qmake/library/qmakeparser.cpp @@ -1147,11 +1147,10 @@ void QMakeParser::finalizeCall(ushort *&tokPtr, ushort *uc, ushort *ptr, int arg uint nlen = uce[1]; if (uce[nlen + 2] == TokFuncTerminator) { m_tmp.setRawData((QChar *)uce + 2, nlen); - if (m_tmp == statics.strhost_build) { + if (m_tmp == statics.strhost_build) m_proFile->setHostBuild(true); - } else { + else parseError(fL1S("Unknown option() %1.").arg(m_tmp)); - } return; } } -- cgit v1.2.3 From ab6d29a6cd6e7759858aabefe382e58733c5f8e0 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 22 Jan 2013 11:00:20 +0100 Subject: QMakeParser: save one ByteArray construction Change-Id: I2845fdefb8b32de227f08017e0e3ad98923d1c87 Reviewed-by: hjk (cherry picked from qtcreator/52be02d1cbbf69d4f82c517c7b633ed3d13b1007) --- qmake/library/qmakeparser.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qmake/library/qmakeparser.cpp') diff --git a/qmake/library/qmakeparser.cpp b/qmake/library/qmakeparser.cpp index ce49caef114..f32267cf599 100644 --- a/qmake/library/qmakeparser.cpp +++ b/qmake/library/qmakeparser.cpp @@ -239,7 +239,7 @@ bool QMakeParser::read(ProFile *pro) } QByteArray bcont = file.readAll(); - if (bcont.startsWith(QByteArray("\xef\xbb\xbf"))) { + if (bcont.startsWith("\xef\xbb\xbf")) { // UTF-8 BOM will cause subtle errors m_handler->message(QMakeParserHandler::ParserIoError, fL1S("Unexpected UTF-8 BOM in %1").arg(pro->fileName())); -- cgit v1.2.3