basegfx/source/curve/b2dcubicbezier.cxx | 10 ----------
basegfx/source/matrix/b2dhommatrix.cxx | 5 -----
basegfx/source/polygon/b2dpolygontriangulator.cxx | 5 -----
basegfx/source/polygon/b2dpolypolygon.cxx | 5 -----
basegfx/source/polygon/b3dpolypolygon.cxx | 5 -----
basegfx/source/range/b2dpolyrange.cxx | 5 -----
basegfx/source/tools/b2dclipstate.cxx | 5 -----
include/basegfx/curve/b2dcubicbezier.hxx | 1 -
include/basegfx/matrix/b2dhommatrix.hxx | 1 -
include/basegfx/polygon/b2dpolypolygon.hxx | 1 -
include/basegfx/polygon/b3dpolypolygon.hxx | 1 -
include/basegfx/range/b2dpolyrange.hxx | 1 -
include/basegfx/utils/b2dclipstate.hxx | 1 -
13 files changed, 46 deletions(-)
New commits:
commit 64a55911eae1cf5f913f07b45a7c8379b325e471
Author: RMZeroFour <ritobrot...@gmail.com>
AuthorDate: Sat Mar 23 14:06:40 2024 +0530
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Sat Mar 23 11:17:06 2024 +0100
tdf#157664 Drop redundant operator != in basegfx module
As part of the efforts in #157664 to remove redundant definitions of
operator!=, to upgrade the codebase to C++20, this commit removes the
remaining definitions in the basegfx module.
Change-Id: I19f2b9ddf42185435313445c8395a851030e2149
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165199
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
Tested-by: Jenkins
diff --git a/basegfx/source/curve/b2dcubicbezier.cxx
b/basegfx/source/curve/b2dcubicbezier.cxx
index 927230fabcb1..fa7b69e1e5e8 100644
--- a/basegfx/source/curve/b2dcubicbezier.cxx
+++ b/basegfx/source/curve/b2dcubicbezier.cxx
@@ -351,16 +351,6 @@ namespace basegfx
);
}
- bool B2DCubicBezier::operator!=(const B2DCubicBezier& rBezier) const
- {
- return (
- maStartPoint != rBezier.maStartPoint
- || maEndPoint != rBezier.maEndPoint
- || maControlPointA != rBezier.maControlPointA
- || maControlPointB != rBezier.maControlPointB
- );
- }
-
bool B2DCubicBezier::equal(const B2DCubicBezier& rBezier) const
{
return (
diff --git a/basegfx/source/matrix/b2dhommatrix.cxx
b/basegfx/source/matrix/b2dhommatrix.cxx
index e4a9dda9e3c5..dc5c02b0e33f 100644
--- a/basegfx/source/matrix/b2dhommatrix.cxx
+++ b/basegfx/source/matrix/b2dhommatrix.cxx
@@ -182,11 +182,6 @@ namespace basegfx
return true;
}
- bool B2DHomMatrix::operator!=(const B2DHomMatrix& rMat) const
- {
- return !(*this == rMat);
- }
-
void B2DHomMatrix::rotate(double fRadiant)
{
if(fTools::equalZero(fRadiant))
diff --git a/basegfx/source/polygon/b2dpolygontriangulator.cxx
b/basegfx/source/polygon/b2dpolygontriangulator.cxx
index 8742ade70e46..b72e3da6039d 100644
--- a/basegfx/source/polygon/b2dpolygontriangulator.cxx
+++ b/basegfx/source/polygon/b2dpolygontriangulator.cxx
@@ -92,11 +92,6 @@ namespace basegfx
return (maStart.equal(rComp.maStart) &&
maEnd.equal(rComp.maEnd));
}
- bool operator!=(const EdgeEntry& rComp) const
- {
- return !(*this == rComp);
- }
-
const B2DPoint& getStart() const { return maStart; }
const B2DPoint& getEnd() const { return maEnd; }
diff --git a/basegfx/source/polygon/b2dpolypolygon.cxx
b/basegfx/source/polygon/b2dpolypolygon.cxx
index 547634dc4dad..fe2a7c7f94c8 100644
--- a/basegfx/source/polygon/b2dpolypolygon.cxx
+++ b/basegfx/source/polygon/b2dpolypolygon.cxx
@@ -241,11 +241,6 @@ public:
return ((*mpPolyPolygon) == (*rPolyPolygon.mpPolyPolygon));
}
- bool B2DPolyPolygon::operator!=(const B2DPolyPolygon& rPolyPolygon) const
- {
- return !((*this) == rPolyPolygon);
- }
-
sal_uInt32 B2DPolyPolygon::count() const
{
return mpPolyPolygon->count();
diff --git a/basegfx/source/polygon/b3dpolypolygon.cxx
b/basegfx/source/polygon/b3dpolypolygon.cxx
index 017906eef5b8..5a43cb876be6 100644
--- a/basegfx/source/polygon/b3dpolypolygon.cxx
+++ b/basegfx/source/polygon/b3dpolypolygon.cxx
@@ -223,11 +223,6 @@ namespace basegfx
return ((*mpPolyPolygon) == (*rPolyPolygon.mpPolyPolygon));
}
- bool B3DPolyPolygon::operator!=(const B3DPolyPolygon& rPolyPolygon) const
- {
- return !(*this == rPolyPolygon);
- }
-
sal_uInt32 B3DPolyPolygon::count() const
{
return mpPolyPolygon->count();
diff --git a/basegfx/source/range/b2dpolyrange.cxx
b/basegfx/source/range/b2dpolyrange.cxx
index beb506fc8e4d..42ee21ec0d64 100644
--- a/basegfx/source/range/b2dpolyrange.cxx
+++ b/basegfx/source/range/b2dpolyrange.cxx
@@ -109,11 +109,6 @@ namespace basegfx
return ((*mpImpl) == (*rRange.mpImpl));
}
- bool B2DPolyRange::operator!=(const B2DPolyRange& rRange) const
- {
- return !(*this == rRange);
- }
-
sal_uInt32 B2DPolyRange::count() const
{
return mpImpl->count();
diff --git a/basegfx/source/tools/b2dclipstate.cxx
b/basegfx/source/tools/b2dclipstate.cxx
index 126235699b4b..3eefdd8c5f12 100644
--- a/basegfx/source/tools/b2dclipstate.cxx
+++ b/basegfx/source/tools/b2dclipstate.cxx
@@ -415,11 +415,6 @@ namespace basegfx::utils
return ((*mpImpl) == (*rRHS.mpImpl));
}
- bool B2DClipState::operator!=(const B2DClipState& rRHS) const
- {
- return !(*this == rRHS);
- }
-
void B2DClipState::unionRange(const B2DRange& rRange)
{
mpImpl->unionRange(rRange);
diff --git a/include/basegfx/curve/b2dcubicbezier.hxx
b/include/basegfx/curve/b2dcubicbezier.hxx
index fe81ed523d97..9d79fbeb5f9d 100644
--- a/include/basegfx/curve/b2dcubicbezier.hxx
+++ b/include/basegfx/curve/b2dcubicbezier.hxx
@@ -48,7 +48,6 @@ namespace basegfx
// compare operators
bool operator==(const B2DCubicBezier& rBezier) const;
- bool operator!=(const B2DCubicBezier& rBezier) const;
bool equal(const B2DCubicBezier& rBezier) const;
// test if vectors are used
diff --git a/include/basegfx/matrix/b2dhommatrix.hxx
b/include/basegfx/matrix/b2dhommatrix.hxx
index 8067b8e1c630..531b1dbfd9c0 100644
--- a/include/basegfx/matrix/b2dhommatrix.hxx
+++ b/include/basegfx/matrix/b2dhommatrix.hxx
@@ -117,7 +117,6 @@ namespace basegfx
void shearY(double fSy);
bool operator==(const B2DHomMatrix& rMat) const;
- bool operator!=(const B2DHomMatrix& rMat) const;
// matrix multiplication from the left to the local
B2DHomMatrix& operator*=(const B2DHomMatrix& rMat);
diff --git a/include/basegfx/polygon/b2dpolypolygon.hxx
b/include/basegfx/polygon/b2dpolypolygon.hxx
index d3177e3c4c91..e0cb5c0c5efc 100644
--- a/include/basegfx/polygon/b2dpolypolygon.hxx
+++ b/include/basegfx/polygon/b2dpolypolygon.hxx
@@ -54,7 +54,6 @@ namespace basegfx
// compare operators
bool operator==(const B2DPolyPolygon& rPolyPolygon) const;
- bool operator!=(const B2DPolyPolygon& rPolyPolygon) const;
// polygon interface
sal_uInt32 count() const;
diff --git a/include/basegfx/polygon/b3dpolypolygon.hxx
b/include/basegfx/polygon/b3dpolypolygon.hxx
index 14a062c08cd6..64d000b2e5f7 100644
--- a/include/basegfx/polygon/b3dpolypolygon.hxx
+++ b/include/basegfx/polygon/b3dpolypolygon.hxx
@@ -55,7 +55,6 @@ namespace basegfx
// compare operators
bool operator==(const B3DPolyPolygon& rPolyPolygon) const;
- bool operator!=(const B3DPolyPolygon& rPolyPolygon) const;
// polygon interface
sal_uInt32 count() const;
diff --git a/include/basegfx/range/b2dpolyrange.hxx
b/include/basegfx/range/b2dpolyrange.hxx
index 9a366956cea2..ff963e5b043c 100644
--- a/include/basegfx/range/b2dpolyrange.hxx
+++ b/include/basegfx/range/b2dpolyrange.hxx
@@ -61,7 +61,6 @@ namespace basegfx
B2DPolyRange& operator=( const B2DPolyRange& );
bool operator==(const B2DPolyRange&) const;
- bool operator!=(const B2DPolyRange&) const;
/// Number of included ranges
sal_uInt32 count() const;
diff --git a/include/basegfx/utils/b2dclipstate.hxx
b/include/basegfx/utils/b2dclipstate.hxx
index f4d9d9e7d67f..acbb6b459647 100644
--- a/include/basegfx/utils/b2dclipstate.hxx
+++ b/include/basegfx/utils/b2dclipstate.hxx
@@ -69,7 +69,6 @@ namespace basegfx::utils
bool isCleared() const;
bool operator==(const B2DClipState&) const;
- bool operator!=(const B2DClipState&) const;
void unionRange(const B2DRange& );
void unionPolyPolygon(const B2DPolyPolygon& );
