diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-09-27 14:22:45 +0200 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2017-12-05 08:19:27 -0500 |
| commit | f5b16fc3aa7540759e6e959dbf664dd83d2f87e4 (patch) | |
| tree | b2013757a5dfda2b992a3b96acc46790a8be86e4 /include/vcl | |
| parent | c30f0d7eb04e6ddc9c1522a745e3bd3bdd622643 (diff) | |
simplify Bitmap operator==/IsEqual (stage2)
Now that we've sorted out which bits are rightfully internal (see commit
7a4064cf87d23bffac987b3e39bf87d9b4d158fc), and which bits need a
comparison operator, rename IsEqual to operator==.
Change-Id: Iec229a7571d76ee18fbc0a4fe672cc2e50a44948
Reviewed-on: https://gerrit.libreoffice.org/42851
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
(cherry picked from commit 09917566b6ce86ea65a246f2055b5d1f41df4e76)
Reviewed-on: https://gerrit.libreoffice.org/45456
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
(cherry picked from commit f641e9d9f472110ccb61c01210e8acf280ad9bf3)
Diffstat (limited to 'include/vcl')
| -rw-r--r-- | include/vcl/alpha.hxx | 5 | ||||
| -rw-r--r-- | include/vcl/bitmap.hxx | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/include/vcl/alpha.hxx b/include/vcl/alpha.hxx index 275d4f87526c..476ca9d06939 100644 --- a/include/vcl/alpha.hxx +++ b/include/vcl/alpha.hxx @@ -46,9 +46,8 @@ public: AlphaMask& operator=( const AlphaMask& rAlphaMask ) { return static_cast<AlphaMask&>( Bitmap::operator=( rAlphaMask ) ); } AlphaMask& operator=( AlphaMask&& rAlphaMask ) { return static_cast<AlphaMask&>( Bitmap::operator=( std::move(rAlphaMask) ) ); } bool operator!() const { return Bitmap::operator!(); } - bool operator==( const AlphaMask& rAlphaMask ) const = delete; - bool operator!=( const AlphaMask& rAlphaMask ) const = delete; - bool IsEqual( const AlphaMask& rAlphaMask ) const { return Bitmap::IsEqual(rAlphaMask); } + bool operator==( const AlphaMask& rAlphaMask ) const { return Bitmap::operator==(rAlphaMask); } + bool operator!=( const AlphaMask& rAlphaMask ) const { return Bitmap::operator!=(rAlphaMask); } void SetPrefMapMode( const MapMode& rMapMode ) { Bitmap::SetPrefMapMode( rMapMode ); } diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx index 74932051bcc4..7534c154aa38 100644 --- a/include/vcl/bitmap.hxx +++ b/include/vcl/bitmap.hxx @@ -229,10 +229,8 @@ public: Bitmap& operator=( const Bitmap& rBitmap ); Bitmap& operator=( Bitmap&& rBitmap ); inline bool operator!() const; - bool operator==( const Bitmap& rBitmap ) const = delete; - bool operator!=( const Bitmap& rBitmap ) const = delete; - - bool IsEqual( const Bitmap& rBmp ) const; + bool operator==( const Bitmap& rBitmap ) const; + bool operator!=( const Bitmap& rBitmap ) const { return !operator==(rBitmap); } inline bool IsEmpty() const; void SetEmpty(); |