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>

5 files changed, 9 insertions, 14 deletions

diff --git a/src/plugins/help/generalsettingspage.cpp b/src/plugins/help/generalsettingspage.cpp
index fb645ec7c3..5f8a42bd80 100644
--- a/src/plugins/help/generalsettingspage.cpp
+++ b/src/plugins/help/generalsettingspage.cpp
@@ -337,9 +337,8 @@ int GeneralSettingsPage::closestPointSizeIndex(int desiredPointSize) const
             if (closestAbsError == 0)
                 break;
         } else {    // past optimum
-            if (absError > closestAbsError) {
+            if (absError > closestAbsError)
                 break;
-            }
         }
     }
     return closestIndex;
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index 3575d92492..91a1644e5e 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -1172,11 +1172,10 @@ void HelpPlugin::handleHelpRequest(const QUrl &url)
             || address.startsWith(HelpViewer::NsTrolltech)) {
                 // local help not installed, resort to external web help
                 QString urlPrefix = QLatin1String("http://doc.qt.digia.com/");
-                if (url.authority() == QLatin1String("com.nokia.qtcreator")) {
+                if (url.authority() == QLatin1String("com.nokia.qtcreator"))
                     urlPrefix.append(QString::fromLatin1("qtcreator"));
-                } else {
+                else
                     urlPrefix.append(QLatin1String("latest"));
-                }
             address = urlPrefix + address.mid(address.lastIndexOf(QLatin1Char('/')));
         }
     }
diff --git a/src/plugins/help/openpagesmanager.cpp b/src/plugins/help/openpagesmanager.cpp
index bad52f1690..72e0ecaeb5 100644
--- a/src/plugins/help/openpagesmanager.cpp
+++ b/src/plugins/help/openpagesmanager.cpp
@@ -259,11 +259,10 @@ void OpenPagesManager::closePagesExcept(const QModelIndex &index)
         int i = 0;
         HelpViewer *viewer = m_model->pageAt(index.row());
         while (m_model->rowCount() > 1) {
-            if (m_model->pageAt(i) != viewer) {
+            if (m_model->pageAt(i) != viewer)
                 removePage(i);
-            } else {
+            else
                 i++;
-            }
         }
     }
 }
diff --git a/src/plugins/help/remotehelpfilter.cpp b/src/plugins/help/remotehelpfilter.cpp
index 464c59791b..aa6cad21e2 100644
--- a/src/plugins/help/remotehelpfilter.cpp
+++ b/src/plugins/help/remotehelpfilter.cpp
@@ -124,9 +124,8 @@ QList<Locator::FilterEntry> RemoteHelpFilter::matchesFor(QFutureInterface<Locato
 void RemoteHelpFilter::accept(Locator::FilterEntry selection) const
 {
     const QString &url = selection.displayName;
-    if (!url.isEmpty()) {
+    if (!url.isEmpty())
         emit linkActivated(url);
-    }
 }
 
 void RemoteHelpFilter::refresh(QFutureInterface<void> &future)
diff --git a/src/plugins/help/searchwidget.cpp b/src/plugins/help/searchwidget.cpp
index 2bc80ba80a..e8d1c2667c 100644
--- a/src/plugins/help/searchwidget.cpp
+++ b/src/plugins/help/searchwidget.cpp
@@ -259,11 +259,10 @@ void SearchWidget::contextMenuEvent(QContextMenuEvent *contextMenuEvent)
     }
 
     QAction *usedAction = menu.exec(mapToGlobal(contextMenuEvent->pos()));
-    if (usedAction == openLink) {
+    if (usedAction == openLink)
         browser->selectAll();
-    } else if (usedAction == openLinkInNewTab) {
+    else if (usedAction == openLinkInNewTab)
         OpenPagesManager::instance().createPageFromSearch(link);
-    } else if (usedAction == copyAnchorAction) {
+    else if (usedAction == copyAnchorAction)
         QApplication::clipboard()->setText(link.toString());
-    }
 }