From 29a93998df8405e8799ad23934a56cd99fb36403 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Tue, 8 Jan 2013 03:32:53 +0200
Subject: 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/coreplugin/toolsettings.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/plugins/coreplugin/toolsettings.cpp')

diff --git a/src/plugins/coreplugin/toolsettings.cpp b/src/plugins/coreplugin/toolsettings.cpp
index 06c41302c6..a00ea33f78 100644
--- a/src/plugins/coreplugin/toolsettings.cpp
+++ b/src/plugins/coreplugin/toolsettings.cpp
@@ -67,9 +67,8 @@ QWidget *ToolSettings::createPage(QWidget *parent)
 {
     m_widget = new ExternalToolConfig(parent);
     m_widget->setTools(ExternalToolManager::instance()->toolsByCategory());
-    if (m_searchKeywords.isEmpty()) {
+    if (m_searchKeywords.isEmpty())
         m_searchKeywords = m_widget->searchKeywords();
-    }
     return m_widget;
 }
 
@@ -151,9 +150,8 @@ void ToolSettings::apply()
             ExternalTool *toolToAdd = 0;
             if (ExternalTool *originalTool = originalTools.take(tool->id())) {
                 // check if it has different category and is custom tool
-                if (tool->displayCategory() != it.key() && !tool->preset()) {
+                if (tool->displayCategory() != it.key() && !tool->preset())
                     tool->setDisplayCategory(it.key());
-                }
                 // check if the tool has changed
                 if ((*originalTool) == (*tool)) {
                     toolToAdd = originalTool;
-- 
cgit v1.2.1