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>

1 files changed, 3 insertions, 5 deletions

diff --git a/src/plugins/coreplugin/rightpane.cpp b/src/plugins/coreplugin/rightpane.cpp
index 7e618f47d7..e3fbc753db 100644
--- a/src/plugins/coreplugin/rightpane.cpp
+++ b/src/plugins/coreplugin/rightpane.cpp
@@ -176,11 +176,10 @@ void RightPaneWidget::saveSettings(QSettings *settings)
 
 void RightPaneWidget::readSettings(QSettings *settings)
 {
-    if (settings->contains(QLatin1String("RightPane/Visible"))) {
+    if (settings->contains(QLatin1String("RightPane/Visible")))
         setShown(settings->value(QLatin1String("RightPane/Visible")).toBool());
-    } else {
+    else
         setShown(false);
-    }
 
     if (settings->contains(QLatin1String("RightPane/Width"))) {
         m_width = settings->value(QLatin1String("RightPane/Width")).toInt();
@@ -190,9 +189,8 @@ void RightPaneWidget::readSettings(QSettings *settings)
         m_width = 500; //pixel
     }
     // Apply
-    if (RightPanePlaceHolder::m_current) {
+    if (RightPanePlaceHolder::m_current)
         RightPanePlaceHolder::m_current->applyStoredSize(m_width);
-    }
 }
 
 void RightPaneWidget::setShown(bool b)