diff options
author | Caolán McNamara <caolanm@redhat.com> | 2017-01-02 21:32:35 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2017-01-03 09:58:27 +0000 |
commit | e4a84c625f28b947816b07654fbe912a466b824a (patch) | |
tree | a1c907eda27fa5c44e129edb6bf1d353f7120ffc | |
parent | 0621795c54956c89dbb2df585df8336b1f86f7ef (diff) |
default copy ctor and assignment operator are good enough
and block default move equivalents
Change-Id: I360860512d2c88f8688685f4e751ded6335549da
Reviewed-on: https://gerrit.libreoffice.org/32656
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r-- | include/basegfx/color/bcolor.hxx | 12 | ||||
-rw-r--r-- | include/basegfx/pixel/bpixel.hxx | 16 | ||||
-rw-r--r-- | include/basegfx/point/b2dpoint.hxx | 12 | ||||
-rw-r--r-- | include/basegfx/tuple/b2dtuple.hxx | 20 | ||||
-rw-r--r-- | include/basegfx/tuple/b3dtuple.hxx | 22 | ||||
-rw-r--r-- | include/basegfx/tuple/b3ituple.hxx | 22 | ||||
-rw-r--r-- | include/basegfx/vector/b2dvector.hxx | 12 | ||||
-rw-r--r-- | include/basegfx/vector/b2ivector.hxx | 12 |
8 files changed, 0 insertions, 128 deletions
diff --git a/include/basegfx/color/bcolor.hxx b/include/basegfx/color/bcolor.hxx index 62cb98bb8d5b..d0854e63a579 100644 --- a/include/basegfx/color/bcolor.hxx +++ b/include/basegfx/color/bcolor.hxx @@ -69,15 +69,6 @@ namespace basegfx : B3DTuple(fLuminosity, fLuminosity, fLuminosity) {} - /** Create a copy of a Color - - @param rVec - The Color which will be copied. - */ - BColor(const BColor& rVec) - : B3DTuple(rVec) - {} - /** constructor with tuple to allow copy-constructing from B3DTuple-based classes */ @@ -85,9 +76,6 @@ namespace basegfx : B3DTuple(rTuple) {} - ~BColor() - {} - // data access read double getRed() const { return mfX; } double getGreen() const { return mfY; } diff --git a/include/basegfx/pixel/bpixel.hxx b/include/basegfx/pixel/bpixel.hxx index bce856c27a97..5ac2e22b2e81 100644 --- a/include/basegfx/pixel/bpixel.hxx +++ b/include/basegfx/pixel/bpixel.hxx @@ -72,22 +72,6 @@ namespace basegfx maPixelUnion.maRGBO.mnO = nOpacity; } - // copy constructor - BPixel(const BPixel& rPixel) - { - maPixelUnion.maCombinedRGBO.mnValue = rPixel.maPixelUnion.maCombinedRGBO.mnValue; - } - - ~BPixel() - {} - - // assignment operator - BPixel& operator=( const BPixel& rPixel ) - { - maPixelUnion.maCombinedRGBO.mnValue = rPixel.maPixelUnion.maCombinedRGBO.mnValue; - return *this; - } - // data access read sal_uInt8 getRed() const { return maPixelUnion.maRGBO.mnR; } sal_uInt8 getGreen() const { return maPixelUnion.maRGBO.mnG; } diff --git a/include/basegfx/point/b2dpoint.hxx b/include/basegfx/point/b2dpoint.hxx index 6d2018814d53..f757cac731da 100644 --- a/include/basegfx/point/b2dpoint.hxx +++ b/include/basegfx/point/b2dpoint.hxx @@ -68,15 +68,6 @@ namespace basegfx @param rPoint The 2D Point which will be copied. */ - B2DPoint(const B2DPoint& rPoint) - : B2DTuple(rPoint) - {} - - /** Create a copy of a 2D Point - - @param rPoint - The 2D Point which will be copied. - */ explicit B2DPoint(const ::basegfx::B2IPoint& rPoint) : B2DTuple(rPoint) {} @@ -88,9 +79,6 @@ namespace basegfx : B2DTuple(rTuple) {} - ~B2DPoint() - {} - /** *=operator to allow usage from B2DPoint, too */ B2DPoint& operator*=( const B2DPoint& rPnt ) diff --git a/include/basegfx/tuple/b2dtuple.hxx b/include/basegfx/tuple/b2dtuple.hxx index b6748a902118..cba49bf0325c 100644 --- a/include/basegfx/tuple/b2dtuple.hxx +++ b/include/basegfx/tuple/b2dtuple.hxx @@ -68,16 +68,6 @@ namespace basegfx mfY( fY ) {} - /** Create a copy of a 2D Tuple - - @param rTup - The 2D Tuple which will be copied. - */ - B2DTuple(const B2DTuple& rTup) - : mfX( rTup.mfX ), - mfY( rTup.mfY ) - {} - /** Create a copy of a 2D integer Tuple @param rTup @@ -85,9 +75,6 @@ namespace basegfx */ BASEGFX_DLLPUBLIC explicit B2DTuple(const B2ITuple& rTup); - ~B2DTuple() - {} - /// Get X-Coordinate of 2D Tuple double getX() const { @@ -208,13 +195,6 @@ namespace basegfx return mfX != rTup.mfX || mfY != rTup.mfY; } - B2DTuple& operator=( const B2DTuple& rTup ) - { - mfX = rTup.mfX; - mfY = rTup.mfY; - return *this; - } - BASEGFX_DLLPUBLIC static const B2DTuple& getEmptyTuple(); }; diff --git a/include/basegfx/tuple/b3dtuple.hxx b/include/basegfx/tuple/b3dtuple.hxx index 30b95beffc94..643663bf8a05 100644 --- a/include/basegfx/tuple/b3dtuple.hxx +++ b/include/basegfx/tuple/b3dtuple.hxx @@ -75,20 +75,6 @@ namespace basegfx mfZ(fZ) {} - /** Create a copy of a 3D Tuple - - @param rTup - The 3D Tuple which will be copied. - */ - B3DTuple(const B3DTuple& rTup) - : mfX( rTup.mfX ), - mfY( rTup.mfY ), - mfZ( rTup.mfZ ) - {} - - ~B3DTuple() - {} - /// get X-Coordinate of 3D Tuple double getX() const { @@ -230,14 +216,6 @@ namespace basegfx return mfX != rTup.mfX || mfY != rTup.mfY || mfZ != rTup.mfZ; } - B3DTuple& operator=( const B3DTuple& rTup ) - { - mfX = rTup.mfX; - mfY = rTup.mfY; - mfZ = rTup.mfZ; - return *this; - } - void correctValues(const double fCompareValue = 0.0) { if(0.0 == fCompareValue) diff --git a/include/basegfx/tuple/b3ituple.hxx b/include/basegfx/tuple/b3ituple.hxx index 971da9f042f8..84ebb919cf78 100644 --- a/include/basegfx/tuple/b3ituple.hxx +++ b/include/basegfx/tuple/b3ituple.hxx @@ -72,20 +72,6 @@ namespace basegfx mnZ(nZ) {} - /** Create a copy of a 3D Tuple - - @param rTup - The 3D Tuple which will be copied. - */ - B3ITuple(const B3ITuple& rTup) - : mnX( rTup.mnX ), - mnY( rTup.mnY ), - mnZ( rTup.mnZ ) - {} - - ~B3ITuple() - {} - /// get X-Coordinate of 3D Tuple sal_Int32 getX() const { @@ -181,14 +167,6 @@ namespace basegfx { return !(*this == rTup); } - - B3ITuple& operator=( const B3ITuple& rTup ) - { - mnX = rTup.mnX; - mnY = rTup.mnY; - mnZ = rTup.mnZ; - return *this; - } }; } // end of namespace basegfx diff --git a/include/basegfx/vector/b2dvector.hxx b/include/basegfx/vector/b2dvector.hxx index 364a4dd984e7..13301d18974f 100644 --- a/include/basegfx/vector/b2dvector.hxx +++ b/include/basegfx/vector/b2dvector.hxx @@ -67,15 +67,6 @@ namespace basegfx @param rVec The 2D Vector which will be copied. */ - B2DVector(const B2DVector& rVec) - : B2DTuple(rVec) - {} - - /** Create a copy of a 2D Vector - - @param rVec - The 2D Vector which will be copied. - */ explicit B2DVector(const ::basegfx::B2IVector& rVec) : B2DTuple(rVec) {} @@ -87,9 +78,6 @@ namespace basegfx : B2DTuple(rTuple) {} - ~B2DVector() - {} - /** *=operator to allow usage from B2DVector, too */ B2DVector& operator*=( const B2DVector& rPnt ) diff --git a/include/basegfx/vector/b2ivector.hxx b/include/basegfx/vector/b2ivector.hxx index 3896852a3a8e..fab0e8cd3eac 100644 --- a/include/basegfx/vector/b2ivector.hxx +++ b/include/basegfx/vector/b2ivector.hxx @@ -63,15 +63,6 @@ namespace basegfx : B2ITuple(nX, nY) {} - /** Create a copy of a 2D Vector - - @param rVec - The 2D Vector which will be copied. - */ - B2IVector(const B2IVector& rVec) - : B2ITuple(rVec) - {} - /** constructor with tuple to allow copy-constructing from B2ITuple-based classes */ @@ -79,9 +70,6 @@ namespace basegfx : B2ITuple(rTuple) {} - ~B2IVector() - {} - /** *=operator to allow usage from B2IVector, too */ B2IVector& operator*=( const B2IVector& rPnt ) |