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/qmlprojectmanager/fileformat/filefilteritems.cpp

@@ -129,11 +129,10 @@ bool FileFilterBaseItem::recursive() const
     } else if (m_recurse == DoNotRecurse) {
         recursive = false;
     } else {  // RecurseDefault
-        if (m_explicitFiles.isEmpty()) {
+        if (m_explicitFiles.isEmpty())
             recursive = true;
-        } else {
+        else
             recursive = false;
-        }
     }
     return recursive;
 }
@@ -142,11 +141,10 @@ void FileFilterBaseItem::setRecursive(bool recurse)
 {
     bool oldRecursive = recursive();
 
-    if (recurse) {
+    if (recurse)
         m_recurse = Recurse;
-    } else {
+    else
             m_recurse = DoNotRecurse;
-    }
 
     if (recurse != oldRecursive)
         updateFileList();
@@ -204,11 +202,10 @@ QString FileFilterBaseItem::absolutePath(const QString &path) const
 QString FileFilterBaseItem::absoluteDir() const
 {
     QString absoluteDir;
-    if (QFileInfo(m_rootDir).isAbsolute()) {
+    if (QFileInfo(m_rootDir).isAbsolute())
         absoluteDir = m_rootDir;
-    } else if (!m_defaultDir.isEmpty()) {
+    else if (!m_defaultDir.isEmpty())
         absoluteDir = m_defaultDir + QLatin1Char('/') + m_rootDir;
-    }
 
     return QDir::cleanPath(absoluteDir);
 }
@@ -264,15 +261,13 @@ void FileFilterBaseItem::updateFileListNow()
 bool FileFilterBaseItem::fileMatches(const QString &fileName) const
 {
     foreach (const QString &suffix, m_fileSuffixes) {
-        if (fileName.endsWith(suffix, Qt::CaseInsensitive)) {
+        if (fileName.endsWith(suffix, Qt::CaseInsensitive))
             return true;
-        }
     }
 
     foreach (QRegExp filter, m_regExpList) {
-        if (filter.exactMatch(fileName)) {
+        if (filter.exactMatch(fileName))
             return true;
-        }
     }
 
     return false;

src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.cpp

@@ -56,9 +56,8 @@ QList<QmlFileFilterItem*> QmlProjectItemPrivate::qmlFileFilters() const
     for (int i = 0; i < content.size(); ++i) {
         QmlProjectContentItem *contentElement = content.at(i);
         QmlFileFilterItem *qmlFileFilter = qobject_cast<QmlFileFilterItem*>(contentElement);
-        if (qmlFileFilter) {
+        if (qmlFileFilter)
             qmlFilters << qmlFileFilter;
-        }
     }
     return qmlFilters;
 }

src/plugins/qmlprojectmanager/qmlproject.cpp

@@ -201,11 +201,10 @@ QStringList QmlProject::convertToAbsoluteFiles(const QStringList &paths) const
 QStringList QmlProject::files() const
 {
     QStringList files;
-    if (m_projectItem) {
+    if (m_projectItem)
         files = m_projectItem.data()->files();
-    } else {
+    else
         files = m_files;
-    }
     return files;
 }
 

src/plugins/qmlprojectmanager/qmlprojectmanager.cpp

@@ -78,9 +78,8 @@ void Manager::unregisterProject(QmlProject *project)
 void Manager::notifyChanged(const QString &fileName)
 {
     foreach (QmlProject *project, m_projects) {
-        if (fileName == project->filesFileName()) {
+        if (fileName == project->filesFileName())
             project->refresh(QmlProject::Files);
-        }
     }
 }
 

src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp

@@ -168,11 +168,10 @@ void QmlProjectRunConfigurationWidget::updateFileComboBox()
             currentIndex = item->index();
     }
 
-    if (currentIndex.isValid()) {
+    if (currentIndex.isValid())
         m_fileListCombo->setCurrentIndex(currentIndex.row());
-    } else {
+    else
         m_fileListCombo->setCurrentIndex(0);
-    }
 }
 
 void QmlProjectRunConfigurationWidget::setMainScript(int index)

src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp

@@ -59,11 +59,10 @@ QmlProjectRunControl::QmlProjectRunControl(QmlProjectRunConfiguration *runConfig
     m_applicationLauncher.setEnvironment(runConfiguration->environment());
     m_applicationLauncher.setWorkingDirectory(runConfiguration->workingDirectory());
 
-    if (mode == NormalRunMode) {
+    if (mode == NormalRunMode)
         m_executable = runConfiguration->viewerPath();
-    } else {
+    else
         m_executable = runConfiguration->observerPath();
-    }
     m_commandLineArguments = runConfiguration->viewerArguments();
     m_mainQmlFile = runConfiguration->mainScript();
 
@@ -217,9 +216,8 @@ RunControl *QmlProjectRunControlFactory::createDebugRunControl(QmlProjectRunConf
     // Makes sure that all bindings go through the JavaScript engine, so that
     // breakpoints are actually hit!
     const QString optimizerKey = QLatin1String("QML_DISABLE_OPTIMIZER");
-    if (!params.environment.hasKey(optimizerKey)) {
+    if (!params.environment.hasKey(optimizerKey))
         params.environment.set(optimizerKey, QLatin1String("1"));
-    }
 
     if (params.executable.isEmpty()) {
         QmlProjectPlugin::showQmlObserverToolWarning();