diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-10 12:47:17 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-10 17:11:51 +0100 |
| commit | 02f72c32cf5e33e28d2b2d63d887c8a429ec2a45 (patch) | |
| tree | 1ea6ec5c51eb243ec4d424acc9ca4302174eea2d | |
| parent | c83f425af90b26d62771fa2a93d93fc24adc22a0 (diff) | |
operator ==, != should return bool
Change-Id: I73cb672175f49535a3d0e248d9ed970bb5e3be4a
| -rw-r--r-- | include/vcl/txtattr.hxx | 12 | ||||
| -rw-r--r-- | vcl/source/edit/txtattr.cxx | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/include/vcl/txtattr.hxx b/include/vcl/txtattr.hxx index 6701be4c6dc5..e2bf0ec9c1f7 100644 --- a/include/vcl/txtattr.hxx +++ b/include/vcl/txtattr.hxx @@ -54,8 +54,8 @@ public: virtual void SetFont( Font& rFont ) const = 0; virtual TextAttrib* Clone() const = 0; - virtual int operator==( const TextAttrib& rAttr ) const = 0; - int operator!=( const TextAttrib& rAttr ) const + virtual bool operator==( const TextAttrib& rAttr ) const = 0; + bool operator!=( const TextAttrib& rAttr ) const { return !(*this == rAttr ); } }; @@ -75,7 +75,7 @@ public: virtual void SetFont( Font& rFont ) const; virtual TextAttrib* Clone() const; - virtual int operator==( const TextAttrib& rAttr ) const; + virtual bool operator==( const TextAttrib& rAttr ) const; }; @@ -91,7 +91,7 @@ public: virtual void SetFont( Font& rFont ) const; virtual TextAttrib* Clone() const; - virtual int operator==( const TextAttrib& rAttr ) const; + virtual bool operator==( const TextAttrib& rAttr ) const; inline FontWeight getFontWeight() const { return meWeight; } }; @@ -119,7 +119,7 @@ public: virtual void SetFont( Font& rFont ) const; virtual TextAttrib* Clone() const; - virtual int operator==( const TextAttrib& rAttr ) const; + virtual bool operator==( const TextAttrib& rAttr ) const; }; class VCL_DLLPUBLIC TextAttribProtect : public TextAttrib @@ -131,7 +131,7 @@ public: virtual void SetFont( Font& rFont ) const; virtual TextAttrib* Clone() const; - virtual int operator==( const TextAttrib& rAttr ) const; + virtual bool operator==( const TextAttrib& rAttr ) const; }; diff --git a/vcl/source/edit/txtattr.cxx b/vcl/source/edit/txtattr.cxx index 09e894156a9d..a9fe2df06957 100644 --- a/vcl/source/edit/txtattr.cxx +++ b/vcl/source/edit/txtattr.cxx @@ -28,7 +28,7 @@ TextAttrib::~TextAttrib() { } -int TextAttrib::operator==( const TextAttrib& rAttr ) const +bool TextAttrib::operator==( const TextAttrib& rAttr ) const { return mnWhich == rAttr.mnWhich; } @@ -58,7 +58,7 @@ TextAttrib* TextAttribFontColor::Clone() const return new TextAttribFontColor( *this ); } -int TextAttribFontColor::operator==( const TextAttrib& rAttr ) const +bool TextAttribFontColor::operator==( const TextAttrib& rAttr ) const { return ( ( TextAttrib::operator==(rAttr ) ) && ( maColor == ((const TextAttribFontColor&)rAttr).maColor ) ); @@ -88,7 +88,7 @@ TextAttrib* TextAttribFontWeight::Clone() const return new TextAttribFontWeight( *this ); } -int TextAttribFontWeight::operator==( const TextAttrib& rAttr ) const +bool TextAttribFontWeight::operator==( const TextAttrib& rAttr ) const { return ( ( TextAttrib::operator==(rAttr ) ) && ( meWeight == ((const TextAttribFontWeight&)rAttr).meWeight ) ); @@ -116,7 +116,7 @@ TextAttrib* TextAttribHyperLink::Clone() const return new TextAttribHyperLink( *this ); } -int TextAttribHyperLink::operator==( const TextAttrib& rAttr ) const +bool TextAttribHyperLink::operator==( const TextAttrib& rAttr ) const { return ( ( TextAttrib::operator==(rAttr ) ) && ( maURL == ((const TextAttribHyperLink&)rAttr).maURL ) && @@ -147,7 +147,7 @@ TextAttrib* TextAttribProtect::Clone() const return new TextAttribProtect(); } -int TextAttribProtect::operator==( const TextAttrib& rAttr ) const +bool TextAttribProtect::operator==( const TextAttrib& rAttr ) const { return ( TextAttrib::operator==(rAttr ) ); } |