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/Wrapping | |
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/Wrapping')
-rw-r--r-- | Tests/Wrapping/Wrap.c | 18 | ||||
-rw-r--r-- | Tests/Wrapping/fakefluid.cxx | 13 | ||||
-rw-r--r-- | Tests/Wrapping/qtnoqtmain.cxx | 1 | ||||
-rw-r--r-- | Tests/Wrapping/qtwrappingmain.cxx | 20 | ||||
-rw-r--r-- | Tests/Wrapping/wrapFLTK.cxx | 5 | ||||
-rw-r--r-- | Tests/Wrapping/wrapping.cxx | 2 |
6 files changed, 26 insertions, 33 deletions
diff --git a/Tests/Wrapping/Wrap.c b/Tests/Wrapping/Wrap.c index 0a1ff50..e8fb8a5 100644 --- a/Tests/Wrapping/Wrap.c +++ b/Tests/Wrapping/Wrap.c @@ -1,23 +1,19 @@ #include <stdio.h> #ifdef __CLASSIC_C__ -int main(argc, argv) - int argc; - char ** argv; +int main(argc, argv) int argc; +char** argv; #else int main(int argc, const char* argv[]) #endif { - FILE* fout = fopen(argv[argc-1], "w"); - printf("Wrap creating \"%s\"\n", argv[argc-1]); - if(fout) - { + FILE* fout = fopen(argv[argc - 1], "w"); + printf("Wrap creating \"%s\"\n", argv[argc - 1]); + if (fout) { fprintf(fout, "int foo() { return 0; }\n"); fclose(fout); - } - else - { + } else { return -1; - } + } return 0; } diff --git a/Tests/Wrapping/fakefluid.cxx b/Tests/Wrapping/fakefluid.cxx index af44679..02c0c52 100644 --- a/Tests/Wrapping/fakefluid.cxx +++ b/Tests/Wrapping/fakefluid.cxx @@ -2,16 +2,13 @@ #include <string.h> int main(int ac, char** av) { - for(int i =0; i < ac; ++i) - { - if(strcmp(av[i], "-o") == 0 || - strcmp(av[i], "-h") == 0) - { - fprintf(stdout, "fakefluid is creating file \"%s\"\n", av[i+1]); - FILE* file = fopen(av[i+1], "w"); + for (int i = 0; i < ac; ++i) { + if (strcmp(av[i], "-o") == 0 || strcmp(av[i], "-h") == 0) { + fprintf(stdout, "fakefluid is creating file \"%s\"\n", av[i + 1]); + FILE* file = fopen(av[i + 1], "w"); fprintf(file, "// hello\n"); fclose(file); - } } + } return 0; } diff --git a/Tests/Wrapping/qtnoqtmain.cxx b/Tests/Wrapping/qtnoqtmain.cxx index 92594d5..e94a125 100644 --- a/Tests/Wrapping/qtnoqtmain.cxx +++ b/Tests/Wrapping/qtnoqtmain.cxx @@ -2,4 +2,3 @@ int main(int ac, char** av) { return 0; } - diff --git a/Tests/Wrapping/qtwrappingmain.cxx b/Tests/Wrapping/qtwrappingmain.cxx index 55c7952..37234d9 100644 --- a/Tests/Wrapping/qtwrappingmain.cxx +++ b/Tests/Wrapping/qtwrappingmain.cxx @@ -2,27 +2,25 @@ #include <qapplication.h> #ifndef _WIN32 -# include <stdio.h> -# include <stdlib.h> +#include <stdio.h> +#include <stdlib.h> #endif -int main(int argc, char *argv[]) +int main(int argc, char* argv[]) { #ifndef _WIN32 const char* display = getenv("DISPLAY"); - if ( display && strlen(display)>0 ) - { + if (display && strlen(display) > 0) { #endif - QApplication app(argc,argv); + QApplication app(argc, argv); qtwrapping qtw; app.setMainWidget(&qtw); #ifndef _WIN32 - } - else - { - printf("Environment variable DISPLAY is not set. I will pretend like the test passed, but you should really set it.\n"); - } + } else { + printf("Environment variable DISPLAY is not set. I will pretend like the " + "test passed, but you should really set it.\n"); + } #endif return 0; diff --git a/Tests/Wrapping/wrapFLTK.cxx b/Tests/Wrapping/wrapFLTK.cxx index 78f2de1..8488f4e 100644 --- a/Tests/Wrapping/wrapFLTK.cxx +++ b/Tests/Wrapping/wrapFLTK.cxx @@ -1 +1,4 @@ -int main(void) { return 0; } +int main(void) +{ + return 0; +} diff --git a/Tests/Wrapping/wrapping.cxx b/Tests/Wrapping/wrapping.cxx index 1482f27..f8b643a 100644 --- a/Tests/Wrapping/wrapping.cxx +++ b/Tests/Wrapping/wrapping.cxx @@ -1,4 +1,4 @@ -int main () +int main() { return 0; } |