feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Remove braces for single lines of conditions

Browse Source 
#!/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>
This commit is contained in:
Orgad Shaneh
2013-01-08 03:32:53 +02:00
committed by hjk
parent 73a2717bed
commit 29a93998df
396 changed files with 1856 additions and 3135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/cpaster/fileshareprotocol.cpp
View File

@@ -116,13 +116,12 @@ static bool parse(const QString &fileName,
}
// Parse elements
elementCount++;
if (user && elementName == QLatin1String(userElementC)) {
if (user && elementName == QLatin1String(userElementC))
*user = reader.readElementText();
} else if (description && elementName == QLatin1String(descriptionElementC)) {
else if (description && elementName == QLatin1String(descriptionElementC))
*description = reader.readElementText();
} else if (text && elementName == QLatin1String(textElementC)) {
else if (text && elementName == QLatin1String(textElementC))
*text = reader.readElementText();
}
}
}
if (reader.hasError()) {
@@ -151,11 +150,10 @@ void FileShareProtocol::fetch(const QString &id)
fi = QFileInfo(m_settings->path + QLatin1Char('/') + id);
QString errorMessage;
QString text;
if (parse(fi.absoluteFilePath(), &errorMessage, 0, 0, &text)) {
if (parse(fi.absoluteFilePath(), &errorMessage, 0, 0, &text))
emit fetchDone(id, text, false);
} else {
else
emit fetchDone(id, errorMessage, true);
}
}
void FileShareProtocol::list()