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/qmlprofiler/qmlprofilertool.cpp

@@ -250,9 +250,8 @@ IAnalyzerEngine *QmlProfilerTool::createEngine(const AnalyzerStartParameters &sp
     }
 
     // FIXME: Check that there's something sensible in sp.connParams
-    if (isTcpConnection) {
+    if (isTcpConnection)
         d->m_profilerConnections->setTcpConnection(sp.connParams.host, sp.connParams.port);
-    }
 
     d->m_runConfiguration = runConfiguration;
 
@@ -404,9 +403,8 @@ void QmlProfilerTool::populateFileFinder(QString projectDirectory, QString activ
         sourceFiles << project->files(Project::ExcludeGeneratedFiles);
 
     if (!projects.isEmpty()) {
-        if (projectDirectory.isEmpty()) {
+        if (projectDirectory.isEmpty())
             projectDirectory = projects.first()->projectDirectory();
-        }
 
         if (activeSysroot.isEmpty()) {
             if (Target *target = projects.first()->activeTarget())
@@ -711,9 +709,8 @@ void QmlProfilerTool::clientRecordingChanged()
 {
     // if application is running, display server record changes
     // if application is stopped, display client record changes
-    if (d->m_profilerState->currentState() != QmlProfilerStateManager::AppRunning) {
+    if (d->m_profilerState->currentState() != QmlProfilerStateManager::AppRunning)
         setRecording(d->m_profilerState->clientRecording());
-    }
 }
 
 void QmlProfilerTool::serverRecordingChanged()