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/qmljstools/qmlconsoleview.cpp

@@ -262,9 +262,8 @@ bool QmlConsoleView::canShowItemInTextEditor(const QModelIndex &index)
     QString filePath = model()->data(index, QmlConsoleItemModel::FileRole).toString();
     if (!filePath.isEmpty()) {
         QFileInfo fi(filePath);
-        if (fi.exists() && fi.isFile() && fi.isReadable()) {
+        if (fi.exists() && fi.isFile() && fi.isReadable())
             return true;
-        }
     }
     return false;
 }

src/plugins/qmljstools/qmljslocatordata.cpp

@@ -70,11 +70,10 @@ public:
     QList<LocatorData::Entry> run(const Document::Ptr &doc)
     {
         m_doc = doc;
-        if (!doc->componentName().isEmpty()) {
+        if (!doc->componentName().isEmpty())
             m_documentContext = doc->componentName();
-        } else {
+        else
             m_documentContext = QFileInfo(doc->fileName()).fileName();
-        }
         accept(doc->ast(), m_documentContext);
         return m_entries;
     }

src/plugins/qmljstools/qmljsmodelmanager.cpp

@@ -213,9 +213,8 @@ ModelManagerInterface::WorkingCopy ModelManager::workingCopy() const
 
         if (TextEditor::ITextEditor *textEditor = qobject_cast<TextEditor::ITextEditor*>(editor)) {
             if (textEditor->context().contains(ProjectExplorer::Constants::LANG_QMLJS)) {
-                if (TextEditor::BaseTextEditorWidget *ed = qobject_cast<TextEditor::BaseTextEditorWidget *>(textEditor->widget())) {
+                if (TextEditor::BaseTextEditorWidget *ed = qobject_cast<TextEditor::BaseTextEditorWidget *>(textEditor->widget()))
                     workingCopy.insert(key, ed->toPlainText(), ed->document()->revision());
-                }
             }
         }
     }
@@ -244,9 +243,8 @@ void ModelManager::updateSourceFiles(const QStringList &files,
 QFuture<void> ModelManager::refreshSourceFiles(const QStringList &sourceFiles,
                                                bool emitDocumentOnDiskChanged)
 {
-    if (sourceFiles.isEmpty()) {
+    if (sourceFiles.isEmpty())
         return QFuture<void>();
-    }
 
     QFuture<void> result = QtConcurrent::run(&ModelManager::parse,
                                               workingCopy(), sourceFiles,

src/plugins/qmljstools/qmljssemanticinfo.cpp

@@ -89,13 +89,12 @@ protected:
 
     virtual bool preVisit(AST::Node *node)
     {
-        if (Statement *stmt = node->statementCast()) {
+        if (Statement *stmt = node->statementCast())
             return handleLocationAst(stmt);
-        } else if (ExpressionNode *exp = node->expressionCast()) {
+        else if (ExpressionNode *exp = node->expressionCast())
             return handleLocationAst(exp);
-        } else if (UiObjectMember *ui = node->uiObjectMemberCast()) {
+        else if (UiObjectMember *ui = node->uiObjectMemberCast())
             return handleLocationAst(ui);
-        }
         return true;
     }
 
@@ -182,11 +181,10 @@ QList<AST::Node *> SemanticInfo::rangePath(int cursorPosition) const
     QList<AST::Node *> path;
 
     foreach (const Range &range, ranges) {
-        if (range.begin.isNull() || range.end.isNull()) {
+        if (range.begin.isNull() || range.end.isNull())
             continue;
-        } else if (cursorPosition >= range.begin.position() && cursorPosition <= range.end.position()) {
+        else if (cursorPosition >= range.begin.position() && cursorPosition <= range.end.position())
             path += range.ast;
-        }
     }
 
     return path;

src/plugins/qmljstools/qmljstoolsplugin.cpp

@@ -132,16 +132,14 @@ ExtensionSystem::IPlugin::ShutdownFlag QmlJSToolsPlugin::aboutToShutdown()
 
 void QmlJSToolsPlugin::onTaskStarted(const QString &type)
 {
-    if (type == QLatin1String(QmlJSTools::Constants::TASK_INDEX)) {
+    if (type == QLatin1String(QmlJSTools::Constants::TASK_INDEX))
         m_resetCodeModelAction->setEnabled(false);
-    }
 }
 
 void QmlJSToolsPlugin::onAllTasksFinished(const QString &type)
 {
-    if (type == QLatin1String(QmlJSTools::Constants::TASK_INDEX)) {
+    if (type == QLatin1String(QmlJSTools::Constants::TASK_INDEX))
         m_resetCodeModelAction->setEnabled(true);
-    }
 }
 
 Q_EXPORT_PLUGIN(QmlJSToolsPlugin)