dbaccess/source/ui/querydesign/QTableConnection.cxx | 2 +-
dbaccess/source/ui/querydesign/QTableConnection.hxx | 2 +-
desktop/source/migration/migration_impl.hxx | 2 +-
emfio/inc/mtftools.hxx | 4 ++--
framework/inc/helper/statusindicatorfactory.hxx | 2 +-
include/o3tl/enumrange.hxx | 2 +-
include/svx/autoformathelper.hxx | 2 +-
include/vcl/EnumContext.hxx | 4 ++--
onlineupdate/source/service/windowsHelper.hxx | 2 +-
svl/source/svdde/ddeimp.hxx | 2 +-
svl/source/svdde/ddestrg.cxx | 2 +-
sw/inc/authfld.hxx | 2 +-
sw/inc/tblafmt.hxx | 2 +-
sw/source/core/doc/tblafmt.cxx | 2 +-
sw/source/core/fields/authfld.cxx | 2 +-
sw/source/core/inc/txmsrt.hxx | 4 ++--
sw/source/uibase/inc/cnttab.hxx | 2 +-
vcl/source/window/EnumContext.cxx | 4 ++--
18 files changed, 22 insertions(+), 22 deletions(-)
New commits:
commit 1be9938157ab91ab16b938eaf2062651f09a0d69
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Mar 12 10:47:39 2020 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Mar 12 11:05:36 2020 +0100
comparison operators should be const
Change-Id: Ifa76e004128223460945d58d1c59c4e23db0f108
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90370
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/dbaccess/source/ui/querydesign/QTableConnection.cxx
b/dbaccess/source/ui/querydesign/QTableConnection.cxx
index 3642eed0a279..15a232683599 100644
--- a/dbaccess/source/ui/querydesign/QTableConnection.cxx
+++ b/dbaccess/source/ui/querydesign/QTableConnection.cxx
@@ -47,7 +47,7 @@ OQueryTableConnection& OQueryTableConnection::operator=(const
OQueryTableConnect
return *this;
}
-bool OQueryTableConnection::operator==(const OQueryTableConnection& rCompare)
+bool OQueryTableConnection::operator==(const OQueryTableConnection& rCompare)
const
{
OSL_ENSURE(GetData() && rCompare.GetData(),
"OQueryTableConnection::operator== : one of the two participants has no data!");
diff --git a/dbaccess/source/ui/querydesign/QTableConnection.hxx
b/dbaccess/source/ui/querydesign/QTableConnection.hxx
index 13ff5c48a7d4..b15a26102bb5 100644
--- a/dbaccess/source/ui/querydesign/QTableConnection.hxx
+++ b/dbaccess/source/ui/querydesign/QTableConnection.hxx
@@ -34,7 +34,7 @@ namespace dbaui
OQueryTableConnection(const OQueryTableConnection& rConn);
OQueryTableConnection& operator=(const OQueryTableConnection& rConn);
- bool operator==(const OQueryTableConnection& rCompare);
+ bool operator==(const OQueryTableConnection& rCompare) const;
OUString const & GetAliasName(EConnectionSide nWhich) const { return
static_cast<OQueryTableConnectionData*>(GetData().get())->GetAliasName(nWhich);
}
diff --git a/desktop/source/migration/migration_impl.hxx
b/desktop/source/migration/migration_impl.hxx
index 029380a710c7..a66c2ea0f113 100644
--- a/desktop/source/migration/migration_impl.hxx
+++ b/desktop/source/migration/migration_impl.hxx
@@ -94,7 +94,7 @@ struct MigrationItem
{
}
- bool operator==(const MigrationItem& aMigrationItem)
+ bool operator==(const MigrationItem& aMigrationItem) const
{
return
(aMigrationItem.m_sCommandURL == m_sCommandURL
diff --git a/emfio/inc/mtftools.hxx b/emfio/inc/mtftools.hxx
index 490bed017147..e61e19f5a58c 100644
--- a/emfio/inc/mtftools.hxx
+++ b/emfio/inc/mtftools.hxx
@@ -351,7 +351,7 @@ namespace emfio
, aBmp(rBmp)
{}
- bool operator==(const WinMtfFillStyle& rStyle)
+ bool operator==(const WinMtfFillStyle& rStyle) const
{
return aFillColor == rStyle.aFillColor
&& bTransparent == rStyle.bTransparent
@@ -381,7 +381,7 @@ namespace emfio
, bTransparent(bTrans)
{}
- bool operator==(const WinMtfLineStyle& rStyle)
+ bool operator==(const WinMtfLineStyle& rStyle) const
{
return aLineColor == rStyle.aLineColor
&& bTransparent == rStyle.bTransparent
diff --git a/framework/inc/helper/statusindicatorfactory.hxx
b/framework/inc/helper/statusindicatorfactory.hxx
index 8472aaec20c2..c16f1eb37b67 100644
--- a/framework/inc/helper/statusindicatorfactory.hxx
+++ b/framework/inc/helper/statusindicatorfactory.hxx
@@ -92,7 +92,7 @@ struct IndicatorInfo
are not interesting then. Because more than one child
indicator can use the same values...
*/
- bool operator==(const css::uno::Reference< css::task::XStatusIndicator
>& xIndicator)
+ bool operator==(const css::uno::Reference< css::task::XStatusIndicator
>& xIndicator) const
{
return (m_xIndicator == xIndicator);
}
diff --git a/include/o3tl/enumrange.hxx b/include/o3tl/enumrange.hxx
index 560a158cecb6..60f069c9f507 100644
--- a/include/o3tl/enumrange.hxx
+++ b/include/o3tl/enumrange.hxx
@@ -58,7 +58,7 @@ public:
++m_value;
}
- bool operator!=( Iterator rhs )
+ bool operator!=( Iterator rhs ) const
{
return m_value != rhs.m_value;
}
diff --git a/include/svx/autoformathelper.hxx b/include/svx/autoformathelper.hxx
index c731ff70b5e0..2d292b1def11 100644
--- a/include/svx/autoformathelper.hxx
+++ b/include/svx/autoformathelper.hxx
@@ -142,7 +142,7 @@ protected:
~AutoFormatBase();
/// Comparing based of boxes backgrounds.
- bool operator==(const AutoFormatBase& rRight);
+ bool operator==(const AutoFormatBase& rRight) const;
public:
// The get-methods.
diff --git a/include/vcl/EnumContext.hxx b/include/vcl/EnumContext.hxx
index 1c68e1b6f014..3609640fe17f 100644
--- a/include/vcl/EnumContext.hxx
+++ b/include/vcl/EnumContext.hxx
@@ -127,8 +127,8 @@ public:
Application GetApplication_DI() const;
- bool operator == (const EnumContext& rOther);
- bool operator != (const EnumContext& rOther);
+ bool operator == (const EnumContext& rOther) const;
+ bool operator != (const EnumContext& rOther) const;
/** When two contexts are matched against each other, then
application or context name may have the wildcard value 'any'.
diff --git a/onlineupdate/source/service/windowsHelper.hxx
b/onlineupdate/source/service/windowsHelper.hxx
index 584fa63f43bf..e17b40c61055 100644
--- a/onlineupdate/source/service/windowsHelper.hxx
+++ b/onlineupdate/source/service/windowsHelper.hxx
@@ -35,7 +35,7 @@ struct AutoHandle
return mHandle;
}
- bool operator==(const AutoHandle& rhs)
+ bool operator==(const AutoHandle& rhs) const
{
return mHandle == rhs.mHandle;
}
diff --git a/svl/source/svdde/ddeimp.hxx b/svl/source/svdde/ddeimp.hxx
index 4c6a5ce872d8..060711bbf32e 100644
--- a/svl/source/svdde/ddeimp.hxx
+++ b/svl/source/svdde/ddeimp.hxx
@@ -66,7 +66,7 @@ public:
DdeString( DWORD, const OUString& );
~DdeString();
- bool operator==( HSZ );
+ bool operator==( HSZ ) const;
HSZ getHSZ();
const OUString & toOUString() const { return m_aString; }
};
diff --git a/svl/source/svdde/ddestrg.cxx b/svl/source/svdde/ddestrg.cxx
index 6789dc1e172f..6ddade45b9c6 100644
--- a/svl/source/svdde/ddestrg.cxx
+++ b/svl/source/svdde/ddestrg.cxx
@@ -34,7 +34,7 @@ DdeString::~DdeString()
DdeFreeStringHandle( hInst, hString );
}
-bool DdeString::operator==( HSZ h )
+bool DdeString::operator==( HSZ h ) const
{
return( !DdeCmpStringHandles( hString, h ) );
}
diff --git a/sw/inc/authfld.hxx b/sw/inc/authfld.hxx
index fdbde3632a19..be11b793f1af 100644
--- a/sw/inc/authfld.hxx
+++ b/sw/inc/authfld.hxx
@@ -36,7 +36,7 @@ friend class SwAuthorityFieldType;
public:
SwAuthEntry() = default;
SwAuthEntry( const SwAuthEntry& rCopy );
- bool operator==(const SwAuthEntry& rComp);
+ bool operator==(const SwAuthEntry& rComp) const;
inline OUString const & GetAuthorField(ToxAuthorityField ePos) const;
inline void SetAuthorField(ToxAuthorityField ePos,
diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx
index bf6719833766..f9073edff8c5 100644
--- a/sw/inc/tblafmt.hxx
+++ b/sw/inc/tblafmt.hxx
@@ -67,7 +67,7 @@ public:
SwBoxAutoFormat& operator=(const SwBoxAutoFormat& rRef);
/// Comparing based of boxes backgrounds.
- bool operator==(const SwBoxAutoFormat& rRight);
+ bool operator==(const SwBoxAutoFormat& rRight) const;
// The get-methods.
const SvxFrameDirectionItem& GetTextOrientation() const { return
*m_aTextOrientation; }
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index 58756cce6d7f..474a7a7bfd09 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -304,7 +304,7 @@ SwBoxAutoFormat& SwBoxAutoFormat::operator=(const
SwBoxAutoFormat& rRef)
return *this;
}
-bool SwBoxAutoFormat::operator==(const SwBoxAutoFormat& rRight)
+bool SwBoxAutoFormat::operator==(const SwBoxAutoFormat& rRight) const
{
return GetBackground().GetColor() == rRight.GetBackground().GetColor();
}
diff --git a/sw/source/core/fields/authfld.cxx
b/sw/source/core/fields/authfld.cxx
index 018a6d4908f3..48a58c07b61d 100644
--- a/sw/source/core/fields/authfld.cxx
+++ b/sw/source/core/fields/authfld.cxx
@@ -53,7 +53,7 @@ SwAuthEntry::SwAuthEntry(const SwAuthEntry& rCopy)
m_aAuthFields[i] = rCopy.m_aAuthFields[i];
}
-bool SwAuthEntry::operator==(const SwAuthEntry& rComp)
+bool SwAuthEntry::operator==(const SwAuthEntry& rComp) const
{
for(int i = 0; i < AUTH_FIELD_END; ++i)
if(m_aAuthFields[i] != rComp.m_aAuthFields[i])
diff --git a/sw/source/core/inc/txmsrt.hxx b/sw/source/core/inc/txmsrt.hxx
index e6d09240e3ce..df88a60a25e5 100644
--- a/sw/source/core/inc/txmsrt.hxx
+++ b/sw/source/core/inc/txmsrt.hxx
@@ -119,8 +119,8 @@ public:
*/
struct SwTOXSortTabBase
{
- bool operator==(const SwTOXSortTabBase&) = delete;
- bool operator<(const SwTOXSortTabBase&) = delete;
+ bool operator==(const SwTOXSortTabBase&) const = delete;
+ bool operator<(const SwTOXSortTabBase&) const = delete;
std::vector<SwTOXSource> aTOXSources;
css::lang::Locale aLocale;
diff --git a/sw/source/uibase/inc/cnttab.hxx b/sw/source/uibase/inc/cnttab.hxx
index 9e5e132e512c..e95cc5c62b96 100644
--- a/sw/source/uibase/inc/cnttab.hxx
+++ b/sw/source/uibase/inc/cnttab.hxx
@@ -41,7 +41,7 @@ struct CurTOXType
TOXTypes eType;
sal_uInt16 nIndex; //for TOX_USER only
- bool operator==(const CurTOXType& rCmp)
+ bool operator==(const CurTOXType& rCmp) const
{
return eType == rCmp.eType && nIndex == rCmp.nIndex;
}
diff --git a/vcl/source/window/EnumContext.cxx
b/vcl/source/window/EnumContext.cxx
index 78bd6cbc675b..3229301e3f2b 100644
--- a/vcl/source/window/EnumContext.cxx
+++ b/vcl/source/window/EnumContext.cxx
@@ -82,13 +82,13 @@ EnumContext::Application EnumContext::GetApplication_DI()
const
}
}
-bool EnumContext::operator== (const EnumContext& rOther)
+bool EnumContext::operator== (const EnumContext& rOther) const
{
return meApplication==rOther.meApplication
&& meContext==rOther.meContext;
}
-bool EnumContext::operator!= (const EnumContext& rOther)
+bool EnumContext::operator!= (const EnumContext& rOther) const
{
return meApplication!=rOther.meApplication
|| meContext!=rOther.meContext;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
