diff options
author | Kitware Robot <kwrobot@kitware.com> | 2016-05-16 14:34:04 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-05-16 20:05:19 (GMT) |
commit | d9fd2f5402eeaa345691313658e02b51038f570b (patch) | |
tree | dca71b9a7e267f4c6300da3eb770415381726785 /Tests/Qt4Targets | |
parent | 82df6deaafb36cbbfd450202bb20b320f637751a (diff) | |
download | CMake-d9fd2f5402eeaa345691313658e02b51038f570b.zip CMake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.gz CMake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.bz2 |
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.
Diffstat (limited to 'Tests/Qt4Targets')
-rw-r--r-- | Tests/Qt4Targets/IncrementalMoc/foo.cpp | 1 | ||||
-rw-r--r-- | Tests/Qt4Targets/activeqtexe.cpp | 23 | ||||
-rw-r--r-- | Tests/Qt4Targets/interface/myinterface.h | 1 | ||||
-rw-r--r-- | Tests/Qt4Targets/main.cpp | 2 | ||||
-rw-r--r-- | Tests/Qt4Targets/main_gen_test.cpp | 7 | ||||
-rw-r--r-- | Tests/Qt4Targets/main_wrap_test.cpp | 2 | ||||
-rw-r--r-- | Tests/Qt4Targets/mywrapobject.h | 5 |
7 files changed, 22 insertions, 19 deletions
diff --git a/Tests/Qt4Targets/IncrementalMoc/foo.cpp b/Tests/Qt4Targets/IncrementalMoc/foo.cpp index e924f7e..00685d0 100644 --- a/Tests/Qt4Targets/IncrementalMoc/foo.cpp +++ b/Tests/Qt4Targets/IncrementalMoc/foo.cpp @@ -4,5 +4,4 @@ Foo::Foo() : QObject(0) { - } diff --git a/Tests/Qt4Targets/activeqtexe.cpp b/Tests/Qt4Targets/activeqtexe.cpp index d4a9121..f17b0a6 100644 --- a/Tests/Qt4Targets/activeqtexe.cpp +++ b/Tests/Qt4Targets/activeqtexe.cpp @@ -9,22 +9,21 @@ class MyObject : public QObject { - Q_OBJECT + Q_OBJECT public: - MyObject(QObject *parent = 0) - : QObject(parent) - { - } + MyObject(QObject* parent = 0) + : QObject(parent) + { + } }; -QAXFACTORY_DEFAULT(MyObject, - "{4dc3f340-a6f7-44e4-a79b-3e9217685fbd}", - "{9ee49617-7d5c-441a-b833-4b068d41d751}", - "{13eca64b-ee2a-4f3c-aa04-5d9d975779a7}", - "{ce947ee3-0403-4fdc-895a-4fe779344b46}", - "{8de435ce-8d2a-46ac-b3b3-cb800d0547c7}"); +QAXFACTORY_DEFAULT(MyObject, "{4dc3f340-a6f7-44e4-a79b-3e9217685fbd}", + "{9ee49617-7d5c-441a-b833-4b068d41d751}", + "{13eca64b-ee2a-4f3c-aa04-5d9d975779a7}", + "{ce947ee3-0403-4fdc-895a-4fe779344b46}", + "{8de435ce-8d2a-46ac-b3b3-cb800d0547c7}"); -int main(int argc, char **argv) +int main(int argc, char** argv) { QApplication app(argc, argv); diff --git a/Tests/Qt4Targets/interface/myinterface.h b/Tests/Qt4Targets/interface/myinterface.h index 59b43ad..5cc3b27 100644 --- a/Tests/Qt4Targets/interface/myinterface.h +++ b/Tests/Qt4Targets/interface/myinterface.h @@ -4,7 +4,6 @@ class MyInterface { - }; Q_DECLARE_INTERFACE(MyInterface, "org.cmake.example.MyInterface") diff --git a/Tests/Qt4Targets/main.cpp b/Tests/Qt4Targets/main.cpp index 3c98c99..07443b0 100644 --- a/Tests/Qt4Targets/main.cpp +++ b/Tests/Qt4Targets/main.cpp @@ -12,7 +12,7 @@ #error Expected QT_GUI_LIB #endif -int main(int argc, char **argv) +int main(int argc, char** argv) { QApplication app(argc, argv); diff --git a/Tests/Qt4Targets/main_gen_test.cpp b/Tests/Qt4Targets/main_gen_test.cpp index 984424b..1ea390b 100644 --- a/Tests/Qt4Targets/main_gen_test.cpp +++ b/Tests/Qt4Targets/main_gen_test.cpp @@ -8,10 +8,13 @@ class MyObject : public QObject, MyInterface Q_OBJECT Q_INTERFACES(MyInterface) public: - explicit MyObject(QObject *parent = 0) : QObject(parent) { } + explicit MyObject(QObject* parent = 0) + : QObject(parent) + { + } }; -int main(int argc, char **argv) +int main(int argc, char** argv) { MyObject mo; mo.objectName(); diff --git a/Tests/Qt4Targets/main_wrap_test.cpp b/Tests/Qt4Targets/main_wrap_test.cpp index 21edc7b..7b74849 100644 --- a/Tests/Qt4Targets/main_wrap_test.cpp +++ b/Tests/Qt4Targets/main_wrap_test.cpp @@ -3,7 +3,7 @@ #include "mywrapobject.h" -int main(int argc, char **argv) +int main(int argc, char** argv) { MyWrapObject mwo; mwo.objectName(); diff --git a/Tests/Qt4Targets/mywrapobject.h b/Tests/Qt4Targets/mywrapobject.h index de23540..5d4e52a 100644 --- a/Tests/Qt4Targets/mywrapobject.h +++ b/Tests/Qt4Targets/mywrapobject.h @@ -11,7 +11,10 @@ class MyWrapObject : public QObject, MyInterface Q_OBJECT Q_INTERFACES(MyInterface) public: - explicit MyWrapObject(QObject *parent = 0) : QObject(parent) { } + explicit MyWrapObject(QObject* parent = 0) + : QObject(parent) + { + } }; #endif |