From 6de3688cc6bd52ce08ff8a4327e59dbbc8a5c7d4 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 15 Feb 2017 23:55:18 +0200 Subject: Drop :: prefix from std in c*/ Change-Id: If078cda95fa6ccd37270a5e9d81cfa0b84e71155 Reviewed-on: https://gerrit.libreoffice.org/34324 Tested-by: Jenkins Reviewed-by: Tor Lillqvist --- comphelper/source/property/opropertybag.cxx | 22 +++++++++++----------- comphelper/source/property/opropertybag.hxx | 8 ++++---- comphelper/source/property/propagg.cxx | 14 +++++++------- comphelper/source/property/property.cxx | 4 ++-- comphelper/source/property/propertybag.cxx | 2 +- .../source/property/propertycontainerhelper.cxx | 16 ++++++++-------- 6 files changed, 33 insertions(+), 33 deletions(-) (limited to 'comphelper/source/property') diff --git a/comphelper/source/property/opropertybag.cxx b/comphelper/source/property/opropertybag.cxx index c07e8c56b2c0..a2e4abdc7a14 100644 --- a/comphelper/source/property/opropertybag.cxx +++ b/comphelper/source/property/opropertybag.cxx @@ -86,10 +86,10 @@ namespace comphelper && (_rArguments[1] >>= AllowEmptyPropertyName) && (_rArguments[2] >>= AutomaticAddition)) { - ::std::copy( + std::copy( aTypes.getConstArray(), aTypes.getConstArray() + aTypes.getLength(), - ::std::insert_iterator< TypeBag >( m_aAllowedTypes, m_aAllowedTypes.begin() ) + std::insert_iterator< TypeBag >( m_aAllowedTypes, m_aAllowedTypes.begin() ) ); m_bAutoAddProperties = AutomaticAddition; @@ -97,10 +97,10 @@ namespace comphelper ::comphelper::NamedValueCollection aArguments( _rArguments ); if ( aArguments.get_ensureType( "AllowedTypes", aTypes ) ) - ::std::copy( + std::copy( aTypes.getConstArray(), aTypes.getConstArray() + aTypes.getLength(), - ::std::insert_iterator< TypeBag >( m_aAllowedTypes, m_aAllowedTypes.begin() ) + std::insert_iterator< TypeBag >( m_aAllowedTypes, m_aAllowedTypes.begin() ) ); aArguments.get_ensureType( "AutomaticAddition", m_bAutoAddProperties ); @@ -350,7 +350,7 @@ namespace comphelper namespace { - struct ComparePropertyValueByName : public ::std::binary_function< PropertyValue, PropertyValue, bool > + struct ComparePropertyValueByName : public std::binary_function< PropertyValue, PropertyValue, bool > { bool operator()( const PropertyValue& _rLHS, const PropertyValue& _rRHS ) { @@ -359,7 +359,7 @@ namespace comphelper }; template< typename CLASS > - struct TransformPropertyToName : public ::std::unary_function< CLASS, OUString > + struct TransformPropertyToName : public std::unary_function< CLASS, OUString > { const OUString& operator()( const CLASS& _rProp ) { @@ -367,7 +367,7 @@ namespace comphelper } }; - struct ExtractPropertyValue : public ::std::unary_function< PropertyValue, Any > + struct ExtractPropertyValue : public std::unary_function< PropertyValue, Any > { const Any& operator()( const PropertyValue& _rProp ) { @@ -387,7 +387,7 @@ namespace comphelper // their names Sequence< OUString > aNames( aProperties.getLength() ); - ::std::transform( + std::transform( aProperties.getConstArray(), aProperties.getConstArray() + aProperties.getLength(), aNames.getArray(), @@ -436,7 +436,7 @@ namespace comphelper { // sort (the XMultiPropertySet interface requires this) Sequence< PropertyValue > aProperties( _rProps ); - ::std::sort( + std::sort( aProperties.getArray(), aProperties.getArray() + aProperties.getLength(), ComparePropertyValueByName() @@ -444,7 +444,7 @@ namespace comphelper // a sequence of names Sequence< OUString > aNames( aProperties.getLength() ); - ::std::transform( + std::transform( aProperties.getConstArray(), aProperties.getConstArray() + aProperties.getLength(), aNames.getArray(), @@ -489,7 +489,7 @@ namespace comphelper // a sequence of values Sequence< Any > aValues( aProperties.getLength() ); - ::std::transform( + std::transform( aProperties.getConstArray(), aProperties.getConstArray() + aProperties.getLength(), aValues.getArray(), diff --git a/comphelper/source/property/opropertybag.hxx b/comphelper/source/property/opropertybag.hxx index 678c457b563f..df08b946d349 100644 --- a/comphelper/source/property/opropertybag.hxx +++ b/comphelper/source/property/opropertybag.hxx @@ -44,7 +44,7 @@ namespace comphelper { - struct UnoTypeLess : public ::std::unary_function< css::uno::Type, bool > + struct UnoTypeLess : public std::unary_function< css::uno::Type, bool > { inline bool operator()( const css::uno::Type& _rLHS, const css::uno::Type& _rRHS ) const { @@ -55,8 +55,8 @@ namespace comphelper } }; - typedef ::std::map< sal_Int32, css::uno::Any > MapInt2Any; - typedef ::std::set< css::uno::Type, UnoTypeLess > TypeBag; + typedef std::map< sal_Int32, css::uno::Any > MapInt2Any; + typedef std::set< css::uno::Type, UnoTypeLess > TypeBag; typedef ::cppu::WeakAggImplHelper5 < css::beans::XPropertyBag , css::util::XModifiable @@ -73,7 +73,7 @@ namespace comphelper { private: /// our IPropertyArrayHelper implementation - ::std::unique_ptr< ::cppu::OPropertyArrayHelper > + std::unique_ptr< ::cppu::OPropertyArrayHelper > m_pArrayHelper; ::comphelper::PropertyBag m_aDynamicProperties; diff --git a/comphelper/source/property/propagg.cxx b/comphelper/source/property/propagg.cxx index 2a7dd2d52537..987fd2e1e323 100644 --- a/comphelper/source/property/propagg.cxx +++ b/comphelper/source/property/propagg.cxx @@ -51,7 +51,7 @@ namespace comphelper const Property* lcl_findPropertyByName( const std::vector< Property >& _rProps, const OUString& _rName ) { Property aNameProp(_rName, 0, Type(), 0); - auto pResult = ::std::lower_bound(_rProps.begin(), _rProps.end(), aNameProp, PropertyCompareByName()); + auto pResult = std::lower_bound(_rProps.begin(), _rProps.end(), aNameProp, PropertyCompareByName()); if ( pResult == _rProps.end() || pResult->Name != _rName ) return nullptr; @@ -67,15 +67,15 @@ OPropertyArrayAggregationHelper::OPropertyArrayAggregationHelper( // merge and sort properties by name, delete duplicates (stable sort ensures delegator properties win) m_aProperties.insert( m_aProperties.end(), _rProperties.begin(), _rProperties.end() ); m_aProperties.insert( m_aProperties.end(), _rAggProperties.begin(), _rAggProperties.end() ); - ::std::stable_sort( m_aProperties.begin(), m_aProperties.end(), PropertyCompareByName() ); - m_aProperties.erase( ::std::unique(m_aProperties.begin(), m_aProperties.end(), + std::stable_sort( m_aProperties.begin(), m_aProperties.end(), PropertyCompareByName() ); + m_aProperties.erase( std::unique(m_aProperties.begin(), m_aProperties.end(), []( const css::beans::Property& x, const css::beans::Property& y ) -> bool { return x.Name == y.Name; } ), m_aProperties.end() ); m_aProperties.shrink_to_fit(); // fill aDelegatorProps with names from _rProperties for a fast existence check // different kinds of properties are processed differently - ::std::unordered_set< OUString, OUStringHash > aDelegatorProps; + std::unordered_set< OUString, OUStringHash > aDelegatorProps; aDelegatorProps.reserve( _rProperties.getLength() ); for( auto &delegateProp: _rProperties ) { @@ -84,7 +84,7 @@ OPropertyArrayAggregationHelper::OPropertyArrayAggregationHelper( "OPropertyArrayAggregationHelper::OPropertyArrayAggregationHelper: duplicate delegatee property!" ); } - ::std::unordered_set< sal_Int32 > existingHandles; + std::unordered_set< sal_Int32 > existingHandles; existingHandles.reserve( m_aProperties.size() ); sal_Int32 nAggregateHandle = _nFirstAggregateId; for ( sal_Int32 nMPLoop = 0; nMPLoop < static_cast< sal_Int32 >( m_aProperties.size() ); ++nMPLoop ) @@ -237,7 +237,7 @@ sal_Int32 OPropertyArrayAggregationHelper::fillHandles( for( sal_Int32 i = 0; i < nReqLen; ++i ) { aNameProp.Name = pReqProps[i]; - auto findIter = ::std::lower_bound(m_aProperties.begin(), m_aProperties.end(), aNameProp, PropertyCompareByName()); + auto findIter = std::lower_bound(m_aProperties.begin(), m_aProperties.end(), aNameProp, PropertyCompareByName()); if ( findIter != m_aProperties.end() ) { _pHandles[i] = findIter->Handle; @@ -253,7 +253,7 @@ namespace internal { private: OPropertySetAggregationHelper& m_rAggregationHelper; - ::std::set< sal_Int32 > m_aProperties; + std::set< sal_Int32 > m_aProperties; sal_Int32 m_nCurrentlyForwarding; public: diff --git a/comphelper/source/property/property.cxx b/comphelper/source/property/property.cxx index c89804d8bba2..a7533bc9f2bf 100644 --- a/comphelper/source/property/property.cxx +++ b/comphelper/source/property/property.cxx @@ -147,7 +147,7 @@ void RemoveProperty(Sequence& _rProps, const OUString& _rPropName) // binaere Suche const Property* pProperties = _rProps.getConstArray(); Property aNameProp(_rPropName, 0, Type(), 0); - const Property* pResult = ::std::lower_bound(pProperties, pProperties + nLen, aNameProp, PropertyCompareByName()); + const Property* pResult = std::lower_bound(pProperties, pProperties + nLen, aNameProp, PropertyCompareByName()); // gefunden ? if ( pResult && (pResult != pProperties + nLen) && (pResult->Name == _rPropName) ) @@ -165,7 +165,7 @@ void ModifyPropertyAttributes(Sequence& seqProps, const OUString& sPro // binaere Suche Property* pProperties = seqProps.getArray(); Property aNameProp(sPropName, 0, Type(), 0); - Property* pResult = ::std::lower_bound(pProperties, pProperties + nLen, aNameProp, PropertyCompareByName()); + Property* pResult = std::lower_bound(pProperties, pProperties + nLen, aNameProp, PropertyCompareByName()); // gefunden ? if ( pResult && (pResult != pProperties + nLen) && (pResult->Name == sPropName) ) diff --git a/comphelper/source/property/propertybag.cxx b/comphelper/source/property/propertybag.cxx index 019c2b9d5723..b3be3ddbf5ac 100644 --- a/comphelper/source/property/propertybag.cxx +++ b/comphelper/source/property/propertybag.cxx @@ -46,7 +46,7 @@ namespace comphelper namespace PropertyAttribute = ::com::sun::star::beans::PropertyAttribute; - typedef ::std::map< sal_Int32, Any > MapInt2Any; + typedef std::map< sal_Int32, Any > MapInt2Any; struct PropertyBag_Impl { PropertyBag_Impl() : m_bAllowEmptyPropertyName(false) { } diff --git a/comphelper/source/property/propertycontainerhelper.cxx b/comphelper/source/property/propertycontainerhelper.cxx index adaa6557a860..dcde4190d495 100644 --- a/comphelper/source/property/propertycontainerhelper.cxx +++ b/comphelper/source/property/propertycontainerhelper.cxx @@ -41,7 +41,7 @@ using namespace ::com::sun::star::beans; namespace { // comparing two property descriptions - struct PropertyDescriptionHandleCompare : public ::std::binary_function< PropertyDescription, PropertyDescription, bool > + struct PropertyDescriptionHandleCompare : public std::binary_function< PropertyDescription, PropertyDescription, bool > { bool operator() (const PropertyDescription& x, const PropertyDescription& y) const { @@ -49,7 +49,7 @@ namespace } }; // comparing two property descriptions (by name) - struct PropertyDescriptionNameMatch : public ::std::unary_function< PropertyDescription, bool > + struct PropertyDescriptionNameMatch : public std::unary_function< PropertyDescription, bool > { OUString m_rCompare; explicit PropertyDescriptionNameMatch( const OUString& _rCompare ) : m_rCompare( _rCompare ) { } @@ -154,7 +154,7 @@ bool OPropertyContainerHelper::isRegisteredProperty( const OUString& _rName ) co // i.e. registered and revoked even though the XPropertySet has already been // accessed, a vector is not really the best data structure anymore ... - ConstPropertiesIterator pos = ::std::find_if( + ConstPropertiesIterator pos = std::find_if( m_aProperties.begin(), m_aProperties.end(), PropertyDescriptionNameMatch( _rName ) @@ -188,7 +188,7 @@ void OPropertyContainerHelper::implPushBackProperty(const PropertyDescription& _ } #endif - PropertiesIterator pos = ::std::lower_bound( + PropertiesIterator pos = std::lower_bound( m_aProperties.begin(), m_aProperties.end(), _rProp, ComparePropertyHandles() ); @@ -433,7 +433,7 @@ OPropertyContainerHelper::PropertiesIterator OPropertyContainerHelper::searchHan PropertyDescription aHandlePropDesc; aHandlePropDesc.aProperty.Handle = _nHandle; // search a lower bound - PropertiesIterator aLowerBound = ::std::lower_bound( + PropertiesIterator aLowerBound = std::lower_bound( m_aProperties.begin(), m_aProperties.end(), aHandlePropDesc, @@ -449,7 +449,7 @@ OPropertyContainerHelper::PropertiesIterator OPropertyContainerHelper::searchHan const Property& OPropertyContainerHelper::getProperty( const OUString& _rName ) const { - ConstPropertiesIterator pos = ::std::find_if( + ConstPropertiesIterator pos = std::find_if( m_aProperties.begin(), m_aProperties.end(), PropertyDescriptionNameMatch( _rName ) @@ -478,14 +478,14 @@ void OPropertyContainerHelper::describeProperties(Sequence< Property >& _rProps) } // as our property vector is sorted by handles, not by name, we have to sort aOwnProps - ::std::sort(aOwnProps.getArray(), aOwnProps.getArray() + aOwnProps.getLength(), PropertyCompareByName()); + std::sort(aOwnProps.getArray(), aOwnProps.getArray() + aOwnProps.getLength(), PropertyCompareByName()); // unfortunately the STL merge function does not allow the output range to overlap one of the input ranges, // so we need an extra sequence Sequence< Property > aOutput; aOutput.realloc(_rProps.getLength() + aOwnProps.getLength()); // do the merge - ::std::merge( _rProps.getConstArray(), _rProps.getConstArray() + _rProps.getLength(), // input 1 + std::merge( _rProps.getConstArray(), _rProps.getConstArray() + _rProps.getLength(), // input 1 aOwnProps.getConstArray(), aOwnProps.getConstArray() + aOwnProps.getLength(), // input 2 aOutput.getArray(), // output PropertyCompareByName() // compare operator -- cgit