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 <[email protected]>

1 files changed, 2 insertions, 3 deletions

diff --git a/src/plugins/analyzerbase/analyzersettings.cpp b/src/plugins/analyzerbase/analyzersettings.cpp
index c33077eeef5..fa9dc5b73ee 100644
--- a/src/plugins/analyzerbase/analyzersettings.cpp
+++ b/src/plugins/analyzerbase/analyzersettings.cpp
@@ -209,11 +209,10 @@ void AnalyzerRunConfigurationAspect::setUsingGlobalSettings(bool value)
     if (value == m_useGlobalSettings)
         return;
     m_useGlobalSettings = value;
-    if (m_useGlobalSettings) {
+    if (m_useGlobalSettings)
         m_subConfigs = AnalyzerGlobalSettings::instance()->subConfigs();
-    } else {
+    else
         m_subConfigs = m_customConfigurations;
-    }
 }
 
 void AnalyzerRunConfigurationAspect::resetCustomToGlobalSettings()