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, 6 deletions

diff --git a/src/plugins/git/gitorious/gitoriousprojectwidget.cpp b/src/plugins/git/gitorious/gitoriousprojectwidget.cpp
index 844beaa22a..08af912f70 100644
--- a/src/plugins/git/gitorious/gitoriousprojectwidget.cpp
+++ b/src/plugins/git/gitorious/gitoriousprojectwidget.cpp
@@ -212,11 +212,10 @@ void GitoriousProjectWidget::setDescription(const QString &description,
         descLine.truncate(newLinePos);
     if (descLine.size() > MaxDescriptionLineLength) {
         const int dotPos = descLine.lastIndexOf(QLatin1Char('.'), MaxDescriptionLineLength);
-        if (dotPos != -1) {
+        if (dotPos != -1)
             descLine.truncate(dotPos);
-        } else {
+        else
             descLine.truncate(MaxDescriptionLineLength);
-        }
         descLine += QLatin1String("...");
     }
     items->at(descriptionColumn)->setText(descLine);
@@ -230,11 +229,10 @@ void GitoriousProjectWidget::setDescription(const QString &description,
         // Do not fall for "(http://XX)", strip special characters
         static QRegExp urlRegExp(QLatin1String("(http://[\\w\\.-]+/[a-zA-Z0-9/\\-&]*)"));
         QTC_CHECK(urlRegExp.isValid());
-        if (urlRegExp.indexIn(description) != -1) {
+        if (urlRegExp.indexIn(description) != -1)
             *url= urlRegExp.cap(1);
-        } else {
+        else
             url->clear();
-        }
     }
 }