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/SwigTest | |
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/SwigTest')
-rw-r--r-- | Tests/SwigTest/example.cxx | 23 | ||||
-rw-r--r-- | Tests/SwigTest/example.h | 36 |
2 files changed, 31 insertions, 28 deletions
diff --git a/Tests/SwigTest/example.cxx b/Tests/SwigTest/example.cxx index 1e8e203..961d6dd 100644 --- a/Tests/SwigTest/example.cxx +++ b/Tests/SwigTest/example.cxx @@ -4,25 +4,30 @@ #define M_PI 3.14159265358979323846 /* Move the shape to a new location */ -void Shape::move(double dx, double dy) { +void Shape::move(double dx, double dy) +{ x += dx; y += dy; } int Shape::nshapes = 0; -double Circle::area(void) { - return M_PI*radius*radius; +double Circle::area(void) +{ + return M_PI * radius * radius; } -double Circle::perimeter(void) { - return 2*M_PI*radius; +double Circle::perimeter(void) +{ + return 2 * M_PI * radius; } -double Square::area(void) { - return width*width; +double Square::area(void) +{ + return width * width; } -double Square::perimeter(void) { - return 4*width; +double Square::perimeter(void) +{ + return 4 * width; } diff --git a/Tests/SwigTest/example.h b/Tests/SwigTest/example.h index c9d59f2..366deb0 100644 --- a/Tests/SwigTest/example.h +++ b/Tests/SwigTest/example.h @@ -1,39 +1,37 @@ /* File : example.h */ -class Shape { +class Shape +{ public: - Shape() { - nshapes++; - } - virtual ~Shape() { - nshapes--; - }; - double x, y; - void move(double dx, double dy); + Shape() { nshapes++; } + virtual ~Shape() { nshapes--; }; + double x, y; + void move(double dx, double dy); virtual double area(void) = 0; virtual double perimeter(void) = 0; - static int nshapes; + static int nshapes; }; -class Circle : public Shape { +class Circle : public Shape +{ private: double radius; + public: - Circle(double r) : radius(r) { }; + Circle(double r) + : radius(r){}; virtual double area(void); virtual double perimeter(void); }; -class Square : public Shape { +class Square : public Shape +{ private: double width; + public: - Square(double w) : width(w) { }; + Square(double w) + : width(w){}; virtual double area(void); virtual double perimeter(void); }; - - - - - |