Kaydet (Commit) 7d250857 authored tarafından Julien Nabet's avatar Julien Nabet

Fix Prefer prefix ++/-- operators

Includes too replacement < by != for comparison between current and end iterators
üst 7a56eef9
......@@ -337,7 +337,7 @@ void ExtensionBox_Impl::select( const rtl::OUString & sName )
const ::osl::MutexGuard aGuard( m_entriesMutex );
typedef ::std::vector< TEntry_Impl >::const_iterator It;
for ( It iIter = m_vEntries.begin(); iIter < m_vEntries.end(); iIter++ )
for ( It iIter = m_vEntries.begin(); iIter != m_vEntries.end(); ++iIter )
{
if ( sName.equals( (*iIter)->m_sTitle ) )
{
......
......@@ -424,7 +424,7 @@ void UpdateInstallDialog::Thread::downloadExtensions()
//Construct a string of all messages contained in the exceptions plus the respective download URLs
::rtl::OUStringBuffer buf(256);
typedef ::std::vector< ::std::pair<OUString, cssu::Exception > >::const_iterator CIT;
for (CIT j = vecExceptions.begin(); j != vecExceptions.end(); j++)
for (CIT j = vecExceptions.begin(); j != vecExceptions.end(); ++j)
{
if (j != vecExceptions.begin())
buf.appendAscii("\n");
......
......@@ -1181,7 +1181,7 @@ uno::Sequence< uno::Sequence<Reference<deploy::XPackage> > >
citVecVec = vecExtensions.begin();
sal_Int32 j = 0;
uno::Sequence< uno::Sequence<Reference<deploy::XPackage> > > seqSeq(vecExtensions.size());
for (;citVecVec != vecExtensions.end(); citVecVec++, j++)
for (;citVecVec != vecExtensions.end(); ++citVecVec, j++)
{
seqSeq[j] = comphelper::containerToSequence(*citVecVec);
}
......
......@@ -69,7 +69,7 @@ ExtensionProperties::ExtensionProperties(
dp_misc::readProperties(props, contentProps);
typedef ::std::list< ::std::pair< OUString, OUString> >::const_iterator CI;
for (CI i = props.begin(); i != props.end(); i++)
for (CI i = props.begin(); i != props.end(); ++i)
{
if (i->first.equals(OUSTR(PROP_SUPPRESS_LICENSE)))
m_prop_suppress_license = i->second;
......
......@@ -311,7 +311,7 @@ void BackendDb::writeVectorOfPair(
Reference<css::xml::dom::XNode>(
vectorNode, css::uno::UNO_QUERY_THROW));
typedef ::std::vector< ::std::pair< OUString, OUString > >::const_iterator CIT;
for (CIT i = vecPairs.begin(); i != vecPairs.end(); i++)
for (CIT i = vecPairs.begin(); i != vecPairs.end(); ++i)
{
const Reference<css::xml::dom::XElement> pairNode(
doc->createElementNS(sNameSpace, sPrefix + sPairTagName));
......
......@@ -367,7 +367,7 @@ void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaT
//Notify the backend responsible for processing the different media
//types that this extension was removed.
ExtensionBackendDb::Data data = readDataFromDb(url);
for (ExtensionBackendDb::Data::ITC_ITEMS i = data.items.begin(); i != data.items.end(); i++)
for (ExtensionBackendDb::Data::ITC_ITEMS i = data.items.begin(); i != data.items.end(); ++i)
{
m_xRootRegistry->packageRemoved(i->first, i->second);
}
......@@ -1649,7 +1649,7 @@ BackendImpl::PackageImpl::getPackagesFromDb(
::std::vector<Reference<deployment::XPackage> > retVector;
typedef ::std::vector< ::std::pair<OUString, OUString> >::const_iterator ITC;
for (ITC i = m_dbData.items.begin(); i != m_dbData.items.end(); i++)
for (ITC i = m_dbData.items.begin(); i != m_dbData.items.end(); ++i)
{
Reference<deployment::XPackage> xExtension =
bindBundleItem(i->first, i->second, true, m_identifier, xCmdEnv);
......
......@@ -451,7 +451,7 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
aTbEntry.pCollatorWrapper = m_aIntlWrapper.getCaseCollator();
aSortedTbs.push_back( aTbEntry );
}
pIter++;
++pIter;
}
// sort toolbars
......
......@@ -1217,7 +1217,7 @@ const rtl::OUString& MergedSettings::getUserClassPath() const
{
::std::vector< ::rtl::OString> ret;
typedef ::std::vector< ::rtl::OUString>::const_iterator cit;
for (cit i = m_vmParams.begin(); i < m_vmParams.end(); i++)
for (cit i = m_vmParams.begin(); i != m_vmParams.end(); ++i)
{
ret.push_back( ::rtl::OUStringToOString(*i, RTL_TEXTENCODING_UTF8));
}
......
......@@ -310,7 +310,7 @@ void OHierarchyElement_Impl::RemoveElement( const ::rtl::Reference< OHierarchyEl
aIter != m_aChildren.end(); /* increment is done in body */)
{
OHierarchyElementList_Impl::iterator aTmpIter = aIter;
aIter++;
++aIter;
if ( aTmpIter->second == aRef )
m_aChildren.erase( aTmpIter );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment