diff options
author | Armin Weiss <aw@openoffice.org> | 2003-12-03 08:24:28 +0000 |
---|---|---|
committer | Armin Weiss <aw@openoffice.org> | 2003-12-03 08:24:28 +0000 |
commit | 220242e6f73291c43fee24a53ff87e2ab39541c3 (patch) | |
tree | ee5f5af378b61f87e4e93dde9bbf75f37741aaab /basegfx | |
parent | 635458fe40f574ca8c325c14b8a7ea2ae261a86c (diff) |
remaned min, max, abs to their longer names due to preprocessor expansions
Diffstat (limited to 'basegfx')
-rw-r--r-- | basegfx/inc/basegfx/point/b2dhompoint.hxx | 10 | ||||
-rw-r--r-- | basegfx/inc/basegfx/point/b3dhompoint.hxx | 10 | ||||
-rw-r--r-- | basegfx/inc/basegfx/tuple/b2dtuple.hxx | 10 | ||||
-rw-r--r-- | basegfx/inc/basegfx/tuple/b3dtuple.hxx | 10 | ||||
-rw-r--r-- | basegfx/source/point/b2dhompoint.cxx | 10 |
5 files changed, 25 insertions, 25 deletions
diff --git a/basegfx/inc/basegfx/point/b2dhompoint.hxx b/basegfx/inc/basegfx/point/b2dhompoint.hxx index 911e61a884fd..ca5fdb9fb9b0 100644 --- a/basegfx/inc/basegfx/point/b2dhompoint.hxx +++ b/basegfx/inc/basegfx/point/b2dhompoint.hxx @@ -2,9 +2,9 @@ * * $RCSfile: b2dhompoint.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: aw $ $Date: 2003-11-28 11:17:51 $ + * last change: $Author: aw $ $Date: 2003-12-03 09:24:24 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -243,11 +243,11 @@ namespace basegfx // external operators ////////////////////////////////////////////////////////////////////////// - B2DHomPoint min(const B2DHomPoint& rVecA, const B2DHomPoint& rVecB); + B2DHomPoint minimum(const B2DHomPoint& rVecA, const B2DHomPoint& rVecB); - B2DHomPoint max(const B2DHomPoint& rVecA, const B2DHomPoint& rVecB); + B2DHomPoint maximum(const B2DHomPoint& rVecA, const B2DHomPoint& rVecB); - B2DHomPoint abs(const B2DHomPoint& rVec); + B2DHomPoint absolute(const B2DHomPoint& rVec); B2DHomPoint interpolate(B2DHomPoint& rOld1, B2DHomPoint& rOld2, double t); diff --git a/basegfx/inc/basegfx/point/b3dhompoint.hxx b/basegfx/inc/basegfx/point/b3dhompoint.hxx index 08079b90a983..2366ea578d70 100644 --- a/basegfx/inc/basegfx/point/b3dhompoint.hxx +++ b/basegfx/inc/basegfx/point/b3dhompoint.hxx @@ -2,9 +2,9 @@ * * $RCSfile: b3dhompoint.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: aw $ $Date: 2003-11-28 11:17:51 $ + * last change: $Author: aw $ $Date: 2003-12-03 09:24:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -343,7 +343,7 @@ namespace basegfx // external operators ////////////////////////////////////////////////////////////////////////// - inline B3DHomPoint min(const B3DHomPoint& rVecA, const B3DHomPoint& rVecB) + inline B3DHomPoint minimum(const B3DHomPoint& rVecA, const B3DHomPoint& rVecB) { B3DHomPoint aMin( (rVecB.getX() < rVecA.getX()) ? rVecB.getX() : rVecA.getX(), @@ -352,7 +352,7 @@ namespace basegfx return aMin; } - inline B3DHomPoint max(const B3DHomPoint& rVecA, const B3DHomPoint& rVecB) + inline B3DHomPoint maximum(const B3DHomPoint& rVecA, const B3DHomPoint& rVecB) { B3DHomPoint aMax( (rVecB.getX() > rVecA.getX()) ? rVecB.getX() : rVecA.getX(), @@ -361,7 +361,7 @@ namespace basegfx return aMax; } - inline B3DHomPoint abs(const B3DHomPoint& rVec) + inline B3DHomPoint absolute(const B3DHomPoint& rVec) { B3DHomPoint aAbs( (0.0 > rVec.getX()) ? -rVec.getX() : rVec.getX(), diff --git a/basegfx/inc/basegfx/tuple/b2dtuple.hxx b/basegfx/inc/basegfx/tuple/b2dtuple.hxx index 4f555481c2c2..c16cb545fa9a 100644 --- a/basegfx/inc/basegfx/tuple/b2dtuple.hxx +++ b/basegfx/inc/basegfx/tuple/b2dtuple.hxx @@ -2,9 +2,9 @@ * * $RCSfile: b2dtuple.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: aw $ $Date: 2003-11-28 11:17:57 $ + * last change: $Author: aw $ $Date: 2003-12-03 09:24:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -261,7 +261,7 @@ namespace basegfx // external operators ////////////////////////////////////////////////////////////////////////// - inline B2DTuple min(const B2DTuple& rTupA, const B2DTuple& rTupB) + inline B2DTuple minimum(const B2DTuple& rTupA, const B2DTuple& rTupB) { B2DTuple aMin( (rTupB.getX() < rTupA.getX()) ? rTupB.getX() : rTupA.getX(), @@ -269,7 +269,7 @@ namespace basegfx return aMin; } - inline B2DTuple max(const B2DTuple& rTupA, const B2DTuple& rTupB) + inline B2DTuple maximum(const B2DTuple& rTupA, const B2DTuple& rTupB) { B2DTuple aMax( (rTupB.getX() > rTupA.getX()) ? rTupB.getX() : rTupA.getX(), @@ -277,7 +277,7 @@ namespace basegfx return aMax; } - inline B2DTuple abs(const B2DTuple& rTup) + inline B2DTuple absolute(const B2DTuple& rTup) { B2DTuple aAbs( (0.0 > rTup.getX()) ? -rTup.getX() : rTup.getX(), diff --git a/basegfx/inc/basegfx/tuple/b3dtuple.hxx b/basegfx/inc/basegfx/tuple/b3dtuple.hxx index 928f1f081855..e57e71b8e3e1 100644 --- a/basegfx/inc/basegfx/tuple/b3dtuple.hxx +++ b/basegfx/inc/basegfx/tuple/b3dtuple.hxx @@ -2,9 +2,9 @@ * * $RCSfile: b3dtuple.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: aw $ $Date: 2003-11-28 11:17:57 $ + * last change: $Author: aw $ $Date: 2003-12-03 09:24:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -344,7 +344,7 @@ namespace basegfx // external operators ////////////////////////////////////////////////////////////////////////// - inline B3DTuple min(const B3DTuple& rTupA, const B3DTuple& rTupB) + inline B3DTuple minimum(const B3DTuple& rTupA, const B3DTuple& rTupB) { B3DTuple aMin( (rTupB.getX() < rTupA.getX()) ? rTupB.getX() : rTupA.getX(), @@ -353,7 +353,7 @@ namespace basegfx return aMin; } - inline B3DTuple max(const B3DTuple& rTupA, const B3DTuple& rTupB) + inline B3DTuple maximum(const B3DTuple& rTupA, const B3DTuple& rTupB) { B3DTuple aMax( (rTupB.getX() > rTupA.getX()) ? rTupB.getX() : rTupA.getX(), @@ -362,7 +362,7 @@ namespace basegfx return aMax; } - inline B3DTuple abs(const B3DTuple& rTup) + inline B3DTuple absolute(const B3DTuple& rTup) { B3DTuple aAbs( (0.0 > rTup.getX()) ? -rTup.getX() : rTup.getX(), diff --git a/basegfx/source/point/b2dhompoint.cxx b/basegfx/source/point/b2dhompoint.cxx index cda1e6f356b5..e23c9530b0e8 100644 --- a/basegfx/source/point/b2dhompoint.cxx +++ b/basegfx/source/point/b2dhompoint.cxx @@ -2,9 +2,9 @@ * * $RCSfile: b2dhompoint.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: aw $ $Date: 2003-11-28 11:18:04 $ + * last change: $Author: aw $ $Date: 2003-12-03 09:24:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -200,7 +200,7 @@ namespace basegfx return *this; } - B2DHomPoint min(const B2DHomPoint& rVecA, const B2DHomPoint& rVecB) + B2DHomPoint minimum(const B2DHomPoint& rVecA, const B2DHomPoint& rVecB) { B2DHomPoint aMin( (rVecB.getX() < rVecA.getX()) ? rVecB.getX() : rVecA.getX(), @@ -208,14 +208,14 @@ namespace basegfx return aMin; } - B2DHomPoint max(const B2DHomPoint& rVecA, const B2DHomPoint& rVecB) + B2DHomPoint maximum(const B2DHomPoint& rVecA, const B2DHomPoint& rVecB) { B2DHomPoint aMax( (rVecB.getX() > rVecA.getX()) ? rVecB.getX() : rVecA.getX(), (rVecB.getY() > rVecA.getY()) ? rVecB.getY() : rVecA.getY()); return aMax; } - B2DHomPoint abs(const B2DHomPoint& rVec) + B2DHomPoint absolute(const B2DHomPoint& rVec) { B2DHomPoint aAbs( (0.0 > rVec.getX()) ? -rVec.getX() : rVec.getX(), |