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>

1 files changed, 4 insertions, 8 deletions

diff --git a/src/plugins/qmlprofiler/qmlprofilereventview.cpp b/src/plugins/qmlprofiler/qmlprofilereventview.cpp
index 82635fa294..e994a2e32f 100644
--- a/src/plugins/qmlprofiler/qmlprofilereventview.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilereventview.cpp
@@ -171,9 +171,8 @@ void QmlProfilerEventsWidget::profilerDataModelStateChanged()
 {
     if (d->m_profilerDataModel) {
         QmlProfilerDataModel::State newState = d->m_profilerDataModel->currentState();
-        if (newState == QmlProfilerDataModel::Empty) {
+        if (newState == QmlProfilerDataModel::Empty)
             clear();
-        }
     }
 }
 
@@ -601,9 +600,8 @@ void QmlProfilerEventsMainView::QmlProfilerEventsMainViewPrivate::buildModelFrom
             continue;
 
         QList<QStandardItem *> newRow;
-        if (m_fieldShown[Name]) {
+        if (m_fieldShown[Name])
             newRow << new EventsViewItem(binding->displayName);
-        }
 
         if (m_fieldShown[Type]) {
             QString typeString = QmlProfilerEventsMainView::nameForType(binding->eventType);
@@ -695,9 +693,8 @@ void QmlProfilerEventsMainView::QmlProfilerEventsMainViewPrivate::buildV8ModelFr
         QV8EventData *v8event = list.at(index);
         QList<QStandardItem *> newRow;
 
-        if (m_fieldShown[Name]) {
+        if (m_fieldShown[Name])
             newRow << new EventsViewItem(v8event->displayName);
-        }
 
         if (m_fieldShown[Percent]) {
             newRow << new EventsViewItem(QString::number(v8event->totalPercent,'f',2)+QLatin1String(" %"));
@@ -813,9 +810,8 @@ void QmlProfilerEventsMainView::jumpToItem(const QModelIndex &index)
     emit eventSelected(infoItem->data(EventIdRole).toInt());
 
     // show in timelinerenderer
-    if (d->m_viewType == EventsView) {
+    if (d->m_viewType == EventsView)
         emit showEventInTimeline(infoItem->data(EventIdRole).toInt());
-    }
 
     d->m_preventSelectBounce = false;
 }