From 7d2508572a0389bcb1c803911024296f411af653 Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Thu, 5 Apr 2012 21:15:13 +0200 Subject: Fix Prefer prefix ++/-- operators Includes too replacement < by != for comparison between current and end iterators --- desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 2 +- desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx | 2 +- desktop/source/deployment/manager/dp_extensionmanager.cxx | 2 +- desktop/source/deployment/manager/dp_properties.cxx | 2 +- desktop/source/deployment/registry/dp_backenddb.cxx | 2 +- desktop/source/deployment/registry/package/dp_package.cxx | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) (limited to 'desktop') diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx index 96c5b1c0bfb2..03bf3cb5329c 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -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 ) ) { diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx index 8852e939c40d..80236785d8ae 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx @@ -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 >::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"); diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx index d7654b67407e..b5822ecfbcc4 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.cxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx @@ -1181,7 +1181,7 @@ uno::Sequence< uno::Sequence > > citVecVec = vecExtensions.begin(); sal_Int32 j = 0; uno::Sequence< uno::Sequence > > seqSeq(vecExtensions.size()); - for (;citVecVec != vecExtensions.end(); citVecVec++, j++) + for (;citVecVec != vecExtensions.end(); ++citVecVec, j++) { seqSeq[j] = comphelper::containerToSequence(*citVecVec); } diff --git a/desktop/source/deployment/manager/dp_properties.cxx b/desktop/source/deployment/manager/dp_properties.cxx index ec8120ff5574..160e8a5dd14f 100644 --- a/desktop/source/deployment/manager/dp_properties.cxx +++ b/desktop/source/deployment/manager/dp_properties.cxx @@ -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; diff --git a/desktop/source/deployment/registry/dp_backenddb.cxx b/desktop/source/deployment/registry/dp_backenddb.cxx index a219f1308c00..1d0686014c8c 100644 --- a/desktop/source/deployment/registry/dp_backenddb.cxx +++ b/desktop/source/deployment/registry/dp_backenddb.cxx @@ -311,7 +311,7 @@ void BackendDb::writeVectorOfPair( Reference( 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 pairNode( doc->createElementNS(sNameSpace, sPrefix + sPairTagName)); diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx index 997fef46d2ad..23f583e16823 100644 --- a/desktop/source/deployment/registry/package/dp_package.cxx +++ b/desktop/source/deployment/registry/package/dp_package.cxx @@ -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 > retVector; typedef ::std::vector< ::std::pair >::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 xExtension = bindBundleItem(i->first, i->second, true, m_identifier, xCmdEnv); -- cgit v1.2.3