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/libs/qtcreatorcdbext/extensioncontext.cpp

@@ -88,11 +88,10 @@ void ExtensionContext::hookCallbacks(CIDebugClient *client)
 
 void ExtensionContext::startRecordingOutput()
 {
-    if (m_creatorOutputCallback) {
+    if (m_creatorOutputCallback)
         m_creatorOutputCallback->startRecording();
-    } else {
+    else
         report('X', 0, 0, "Error", "ExtensionContext::startRecordingOutput() called with no output hooked.\n");
-    }
 }
 
 std::wstring ExtensionContext::stopRecordingOutput()
@@ -189,18 +188,16 @@ void ExtensionContext::notifyIdleCommand(CIDebugClient *client)
         formatGdbmiHash(str, stopReasons, false);
         const std::string threadInfo = gdbmiThreadList(exc.systemObjects(), exc.symbols(),
                                                        exc.control(), exc.advanced(), &errorMessage);
-        if (threadInfo.empty()) {
+        if (threadInfo.empty())
             str << ",threaderror=" << gdbmiStringFormat(errorMessage);
-        } else {
+        else
             str << ",threads=" << threadInfo;
-        }
         const std::string stackInfo = gdbmiStack(exc.control(), exc.symbols(),
                                                  maxStackFrames, false, &errorMessage);
-        if (stackInfo.empty()) {
+        if (stackInfo.empty())
             str << ",stackerror=" << gdbmiStringFormat(errorMessage);
-        } else {
+        else
             str << ",stack=" << stackInfo;
-        }
         str << '}';
         reportLong('E', 0, "session_idle", str.str());
     }