Revise C++ coding style using clang-format

Run the `Utilities/Scripts/clang-format.bash` script to update
all our C++ code to a new style defined by `.clang-format`.
Use `clang-format` version 3.8.

* If you reached this commit for a line in `git blame`, re-run the blame
  operation starting at the parent of this commit to see older history
  for the content.

* See the parent commit for instructions to rebase a change across this
  style transition commit.

7 files changed, 43 insertions, 51 deletions

diff --git a/Tests/QtAutoUicInterface/klocalizedstring.cpp b/Tests/QtAutoUicInterface/klocalizedstring.cpp
index f2324bb..b629cd1 100644
--- a/Tests/QtAutoUicInterface/klocalizedstring.cpp
+++ b/Tests/QtAutoUicInterface/klocalizedstring.cpp
@@ -1,12 +1,12 @@
 
 #include "klocalizedstring.h"
 
-QString tr2xi18n(const char *text, const char *)
+QString tr2xi18n(const char* text, const char*)
 {
   return QLatin1String("TranslatedX") + QString::fromLatin1(text);
 }
 
-QString tr2i18n(const char *text, const char *)
+QString tr2i18n(const char* text, const char*)
 {
   return QLatin1String("Translated") + QString::fromLatin1(text);
 }
diff --git a/Tests/QtAutoUicInterface/klocalizedstring.h b/Tests/QtAutoUicInterface/klocalizedstring.h
index 559058f..6129599 100644
--- a/Tests/QtAutoUicInterface/klocalizedstring.h
+++ b/Tests/QtAutoUicInterface/klocalizedstring.h
@@ -7,11 +7,11 @@
 #ifdef _WIN32
 __declspec(dllexport)
 #endif
-QString tr2xi18n(const char *text, const char *comment = 0);
+  QString tr2xi18n(const char* text, const char* comment = 0);
 
 #ifdef _WIN32
 __declspec(dllexport)
 #endif
-QString tr2i18n(const char *text, const char *comment = 0);
+  QString tr2i18n(const char* text, const char* comment = 0);
 
 #endif
diff --git a/Tests/QtAutoUicInterface/libwidget.cpp b/Tests/QtAutoUicInterface/libwidget.cpp
index 8a921b3..b25f3d7 100644
--- a/Tests/QtAutoUicInterface/libwidget.cpp
+++ b/Tests/QtAutoUicInterface/libwidget.cpp
@@ -1,9 +1,9 @@
 
 #include "libwidget.h"
 
-LibWidget::LibWidget(QWidget *parent)
-  : QWidget(parent),
-    ui(new Ui::LibWidget)
+LibWidget::LibWidget(QWidget* parent)
+  : QWidget(parent)
+  , ui(new Ui::LibWidget)
 {
   ui->setupUi(this);
 }
diff --git a/Tests/QtAutoUicInterface/libwidget.h b/Tests/QtAutoUicInterface/libwidget.h
index 8b592ec..a4400d2 100644
--- a/Tests/QtAutoUicInterface/libwidget.h
+++ b/Tests/QtAutoUicInterface/libwidget.h
@@ -15,7 +15,7 @@ class LibWidget : public QWidget
 {
   Q_OBJECT
 public:
-  explicit LibWidget(QWidget *parent = 0);
+  explicit LibWidget(QWidget* parent = 0);
 
 private:
   const std::auto_ptr<Ui::LibWidget> ui;
diff --git a/Tests/QtAutoUicInterface/main.cpp b/Tests/QtAutoUicInterface/main.cpp
index 42d5958..68bd843 100644
--- a/Tests/QtAutoUicInterface/main.cpp
+++ b/Tests/QtAutoUicInterface/main.cpp
@@ -3,70 +3,62 @@
 #include <iostream>
 #include <string>
 
-int main(int argc, char **argv)
+int main(int argc, char** argv)
 {
   std::ifstream f;
   f.open(UI_LIBWIDGET_H);
-  if (!f.is_open())
-    {
+  if (!f.is_open()) {
     std::cout << "Could not open \"" UI_LIBWIDGET_H "\"." << std::endl;
     return -1;
-    }
+  }
 
   {
-  bool gotTr2i18n = false;
+    bool gotTr2i18n = false;
 
-  while (!f.eof())
-    {
-    std::string output;
-    getline(f, output);
-    if (!gotTr2i18n)
-      {
-      gotTr2i18n = output.find("tr2i18n") != std::string::npos;
+    while (!f.eof()) {
+      std::string output;
+      getline(f, output);
+      if (!gotTr2i18n) {
+        gotTr2i18n = output.find("tr2i18n") != std::string::npos;
       }
-    if (output.find("tr2xi18n") != std::string::npos)
-      {
-      std::cout << "ui_libwidget,h uses tr2xi18n, though it should not." << std::endl;
-      return -1;
+      if (output.find("tr2xi18n") != std::string::npos) {
+        std::cout << "ui_libwidget,h uses tr2xi18n, though it should not."
+                  << std::endl;
+        return -1;
       }
     }
 
-  if (!gotTr2i18n)
-    {
-    std::cout << "Did not find tr2i18n in ui_libwidget.h" << std::endl;
-    return -1;
+    if (!gotTr2i18n) {
+      std::cout << "Did not find tr2i18n in ui_libwidget.h" << std::endl;
+      return -1;
     }
   }
 
   f.close();
   f.open(UI_MYWIDGET_H);
-  if (!f.is_open())
-    {
+  if (!f.is_open()) {
     std::cout << "Could not open \"" UI_MYWIDGET_H "\"." << std::endl;
     return -1;
-    }
+  }
 
   {
-  bool gotTr2xi18n = false;
+    bool gotTr2xi18n = false;
 
-  while (!f.eof())
-    {
-    std::string output;
-    getline(f, output);
-    if (!gotTr2xi18n)
-      {
-      gotTr2xi18n = output.find("tr2xi18n") != std::string::npos;
+    while (!f.eof()) {
+      std::string output;
+      getline(f, output);
+      if (!gotTr2xi18n) {
+        gotTr2xi18n = output.find("tr2xi18n") != std::string::npos;
       }
-    if (output.find("tr2i18n") != std::string::npos)
-      {
-      std::cout << "ui_mywidget,h uses tr2i18n, though it should not." << std::endl;
-      return -1;
+      if (output.find("tr2i18n") != std::string::npos) {
+        std::cout << "ui_mywidget,h uses tr2i18n, though it should not."
+                  << std::endl;
+        return -1;
       }
     }
-  if (!gotTr2xi18n)
-    {
-    std::cout << "Did not find tr2xi18n in ui_mywidget.h" << std::endl;
-    return -1;
+    if (!gotTr2xi18n) {
+      std::cout << "Did not find tr2xi18n in ui_mywidget.h" << std::endl;
+      return -1;
     }
   }
   f.close();
diff --git a/Tests/QtAutoUicInterface/mywidget.cpp b/Tests/QtAutoUicInterface/mywidget.cpp
index b528b1a..885165b 100644
--- a/Tests/QtAutoUicInterface/mywidget.cpp
+++ b/Tests/QtAutoUicInterface/mywidget.cpp
@@ -1,9 +1,9 @@
 
 #include "mywidget.h"
 
-MyWidget::MyWidget(QWidget *parent)
-  : QWidget(parent),
-    ui(new Ui::MyWidget)
+MyWidget::MyWidget(QWidget* parent)
+  : QWidget(parent)
+  , ui(new Ui::MyWidget)
 {
   ui->setupUi(this);
 }
diff --git a/Tests/QtAutoUicInterface/mywidget.h b/Tests/QtAutoUicInterface/mywidget.h
index c96fb98..fc49e80 100644
--- a/Tests/QtAutoUicInterface/mywidget.h
+++ b/Tests/QtAutoUicInterface/mywidget.h
@@ -15,7 +15,7 @@ class MyWidget : public QWidget
 {
   Q_OBJECT
 public:
-  explicit MyWidget(QWidget *parent = 0);
+  explicit MyWidget(QWidget* parent = 0);
 
 private:
   const std::auto_ptr<Ui::MyWidget> ui;