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>

src/plugins/qt4projectmanager/qt4project.cpp

@@ -607,9 +607,8 @@ void Qt4Project::updateCppCodeModel()
         QList<HeaderPath> headers;
         if (tc)
             headers = tc->systemHeaderPaths(cxxflags, SysRootKitInformation::sysRoot(k));
-        if (qtVersion) {
+        if (qtVersion)
             headers.append(qtVersion->systemHeaderPathes(k));
-        }
 
         foreach (const HeaderPath &headerPath, headers) {
             if (headerPath.kind() == HeaderPath::FrameworkHeaderPath)
@@ -1313,9 +1312,8 @@ void CentralizedFolderWatcher::unwatchFolders(const QList<QString> &folders, Qt4
         if (!folder.endsWith(slash))
             folder.append(slash);
         m_map.remove(folder, node);
-        if (!m_map.contains(folder)) {
+        if (!m_map.contains(folder))
             m_watcher.removePath(folder);
-        }
 
         // Figure out which recursive directories we can remove
         // this might not scale. I'm pretty sure it doesn't