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/shared/help/bookmarkmanager.cpp

@@ -397,12 +397,10 @@ void BookmarkWidget::customContextMenuRequested(const QPoint &point)
     if (!pickedAction)
         return;
 
-    if (pickedAction == showItem) {
+    if (pickedAction == showItem)
         emit linkActivated(data);
-    }
-    else if (pickedAction == showItemNewTab) {
+    else if (pickedAction == showItemNewTab)
         emit createPage(QUrl(data), false);
-    }
     else if (pickedAction == removeItem) {
         bookmarkManager->removeBookmarkItem(treeView,
             filterBookmarkModel->mapToSource(index));
@@ -674,11 +672,10 @@ QModelIndex BookmarkManager::addNewFolder(const QModelIndex& index)
     item->setData(QLatin1String("Folder"), Qt::UserRole + 10);
     item->setIcon(QApplication::style()->standardIcon(QStyle::SP_DirClosedIcon));
 
-    if (index.isValid()) {
+    if (index.isValid())
         treeModel->itemFromIndex(index)->appendRow(item);
-    } else {
+    else
         treeModel->appendRow(item);
-    }
     return treeModel->indexFromItem(item);
 }
 
@@ -785,9 +782,8 @@ void BookmarkManager::setupBookmarkModels()
                 }
             }
             parents.last()->appendRow(item);
-            if (type == QLatin1String("Folder")) {
+            if (type == QLatin1String("Folder"))
                 parents << item; lastDepths << depth;
-            }
         }
 
         if (type != QLatin1String("Folder")) {