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, 7 insertions, 13 deletions

diff --git a/src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp b/src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp
index 02369818fb..9a2331102a 100644
--- a/src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp
+++ b/src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp
@@ -276,9 +276,8 @@ protected:
                 if (NamedType *namedTy = ptrTy->elementType()->asNamedType()) {
                     QByteArray typeName = namedTy->name()->identifier()->chars();
 
-                    if (typeName.endsWith("AST") && memberName != "next") {
+                    if (typeName.endsWith("AST") && memberName != "next")
                         *out << "        accept(" << memberName.constData() << ", visitor);" << endl;
-                    }
                 }
             }
         }
@@ -286,9 +285,8 @@ protected:
         for (unsigned i = 0; i < klass->baseClassCount(); ++i) {
             const QByteArray baseClassName = klass->baseClassAt(i)->identifier()->chars();
 
-            if (ClassSpecifierAST *baseClassSpec = classMap.value(baseClassName, 0)) {
+            if (ClassSpecifierAST *baseClassSpec = classMap.value(baseClassName, 0))
                 visitMembers(baseClassSpec->symbol);
-            }
         }
     }
 
@@ -550,9 +548,8 @@ protected:
         for (unsigned i = 0; i < klass->baseClassCount(); ++i) {
             const QByteArray baseClassName = klass->baseClassAt(i)->identifier()->chars();
 
-            if (ClassSpecifierAST *baseClassSpec = classMap.value(baseClassName, 0)) {
+            if (ClassSpecifierAST *baseClassSpec = classMap.value(baseClassName, 0))
                 visitMembers(baseClassSpec->symbol);
-            }
         }
     }
 
@@ -693,9 +690,8 @@ protected:
         for (unsigned i = 0; i < klass->baseClassCount(); ++i) {
             const QByteArray baseClassName = klass->baseClassAt(i)->identifier()->chars();
 
-            if (ClassSpecifierAST *baseClassSpec = classMap.value(baseClassName, 0)) {
+            if (ClassSpecifierAST *baseClassSpec = classMap.value(baseClassName, 0))
                 visitMembers(baseClassSpec->symbol);
-            }
         }
     }
 
@@ -826,9 +822,8 @@ protected:
         for (unsigned i = 0; i < klass->baseClassCount(); ++i) {
             const QByteArray baseClassName = klass->baseClassAt(i)->identifier()->chars();
 
-            if (ClassSpecifierAST *baseClassSpec = classMap.value(baseClassName, 0)) {
+            if (ClassSpecifierAST *baseClassSpec = classMap.value(baseClassName, 0))
                 visitMembers(baseClassSpec->symbol);
-            }
         }
     }
 
@@ -1198,11 +1193,10 @@ void generateAST_cpp(const Snapshot &snapshot, const QDir &cplusplusDir)
         QTextStream os(&method);
         const QStringList fields = collectFieldNames(info.classAST, true);
 
-        if (info.firstToken) {
+        if (info.firstToken)
             generateFirstToken(os, className, fields);
-        } else if (info.lastToken) {
+        else if (info.lastToken)
             generateLastToken(os, className, fields);
-        }
 
         changes.replace(info.start, info.end, method);
     }