[Libreoffice-commits] .: 5 commits - svl/source toolkit/source ucbhelper/source unotools/source
Caolán McNamara
caolan at kemper.freedesktop.org
Fri Dec 24 06:28:01 PST 2010
svl/source/passwordcontainer/passwordcontainer.cxx | 32 ++++++++++-----------
toolkit/source/layout/core/box.cxx | 8 ++---
toolkit/source/layout/core/import.cxx | 2 -
ucbhelper/source/client/proxydecider.cxx | 4 +-
unotools/source/property/propertysetinfo.cxx | 4 +-
5 files changed, 25 insertions(+), 25 deletions(-)
New commits:
commit 469006fff0e5ad63baea2f53388c8594a3bb49ba
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Dec 24 13:36:52 2010 +0000
cppcheck: prefer prefix variant
diff --git a/unotools/source/property/propertysetinfo.cxx b/unotools/source/property/propertysetinfo.cxx
index 5bfc3b2..4dab3ab 100644
--- a/unotools/source/property/propertysetinfo.cxx
+++ b/unotools/source/property/propertysetinfo.cxx
@@ -127,8 +127,8 @@ Sequence< Property > PropertyMapImpl::getProperties() throw()
pProperties->Handle = pEntry->mnWhich;
pProperties->Type = *pEntry->mpType;
pProperties->Attributes = pEntry->mnFlags;
- pProperties++;
- aIter++;
+ ++pProperties;
+ ++aIter;
}
}
commit 479b3c4e59514dc835bdf9708d5c19bc5dae2f6f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Dec 24 13:34:43 2010 +0000
cppcheck: prefer prefix variant
diff --git a/toolkit/source/layout/core/box.cxx b/toolkit/source/layout/core/box.cxx
index 1807064..27fab86 100644
--- a/toolkit/source/layout/core/box.cxx
+++ b/toolkit/source/layout/core/box.cxx
@@ -99,7 +99,7 @@ Box::calculateSize( long nWidth )
mbHasFlowChildren = false;
for ( std::list<Box_Base::ChildData *>::const_iterator it
- = maChildren.begin(); it != maChildren.end(); it++ )
+ = maChildren.begin(); it != maChildren.end(); ++it )
{
ChildData *child = static_cast<Box::ChildData*> ( *it );
if ( !child->isVisible() )
@@ -141,7 +141,7 @@ Box::calculateSize( long nWidth )
if ( nWidth == 0 )
nWidth = nSecSize ? nSecSize : nFlowMinWidth;
for ( std::list<Box_Base::ChildData *>::const_iterator it
- = maChildren.begin(); it != maChildren.end(); it++ )
+ = maChildren.begin(); it != maChildren.end(); ++it )
{
ChildData *child = static_cast<Box::ChildData*> ( *it );
if ( !child->isVisible() )
@@ -192,7 +192,7 @@ Box::allocateArea( const awt::Rectangle &newArea )
int nVisibleChildren = 0, nExpandChildren = 0;
for ( std::list<Box_Base::ChildData *>::const_iterator it
- = maChildren.begin(); it != maChildren.end(); it++ )
+ = maChildren.begin(); it != maChildren.end(); ++it )
{
ChildData *child = static_cast<Box::ChildData*> ( *it );
if ( child->isVisible() )
@@ -229,7 +229,7 @@ Box::allocateArea( const awt::Rectangle &newArea )
int nBoxSecSize = SAL_MAX( 1, secDim( newSize ) - mnBorderWidth * 2 );
for ( std::list<Box_Base::ChildData *>::const_iterator it
- = maChildren.begin(); it != maChildren.end(); it++ )
+ = maChildren.begin(); it != maChildren.end(); ++it )
{
ChildData *child = static_cast<Box::ChildData*> ( *it );
if ( !child->isVisible() )
commit 9e7d2bf3cf5d417b3859eebd3257e1a199692b9a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Dec 24 13:33:44 2010 +0000
cppcheck: prefer prefix variant
diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx
index e9c43f1..4a2c8c5 100644
--- a/svl/source/passwordcontainer/passwordcontainer.cxx
+++ b/svl/source/passwordcontainer/passwordcontainer.cxx
@@ -619,7 +619,7 @@ vector< ::rtl::OUString > PasswordContainer::DecodePasswords( const ::rtl::OUStr
void PasswordContainer::UpdateVector( const ::rtl::OUString& aURL, list< NamePassRecord >& toUpdate, NamePassRecord& aRecord, sal_Bool writeFile ) throw(RuntimeException)
{
- for( list< NamePassRecord >::iterator aNPIter = toUpdate.begin(); aNPIter != toUpdate.end(); aNPIter++ )
+ for( list< NamePassRecord >::iterator aNPIter = toUpdate.begin(); aNPIter != toUpdate.end(); ++aNPIter )
if( aNPIter->GetUserName().equals( aRecord.GetUserName() ) )
{
if( aRecord.HasPasswords( MEMORY_RECORD ) )
@@ -684,7 +684,7 @@ Sequence< UserRecord > PasswordContainer::CopyToUserRecordSequence( const list<
for( list< NamePassRecord >::const_iterator aNPIter = original.begin();
aNPIter != original.end();
- aNPIter++, nInd++ )
+ ++aNPIter, ++nInd )
{
aResult[nInd] = CopyToUserRecord( *aNPIter, bTryToDecode, aHandler );
}
@@ -768,7 +768,7 @@ Sequence< UserRecord > PasswordContainer::FindUsr( const list< NamePassRecord >&
sal_uInt32 nInd = 0;
for( list< NamePassRecord >::const_iterator aNPIter = userlist.begin();
aNPIter != userlist.end();
- aNPIter++, nInd++ )
+ ++aNPIter, ++nInd )
{
if( aNPIter->GetUserName().equals( aName ) )
{
@@ -984,7 +984,7 @@ void SAL_CALL PasswordContainer::remove( const ::rtl::OUString& aURL, const ::rt
if( aIter != m_aContainer.end() )
{
- for( list< NamePassRecord >::iterator aNPIter = aIter->second.begin(); aNPIter != aIter->second.end(); aNPIter++ )
+ for( list< NamePassRecord >::iterator aNPIter = aIter->second.begin(); aNPIter != aIter->second.end(); ++aNPIter )
if( aNPIter->GetUserName().equals( aName ) )
{
if( aNPIter->HasPasswords( PERSISTENT_RECORD ) && m_pStorageFile )
@@ -1026,7 +1026,7 @@ void SAL_CALL PasswordContainer::removePersistent( const ::rtl::OUString& aURL,
if( aIter != m_aContainer.end() )
{
- for( list< NamePassRecord >::iterator aNPIter = aIter->second.begin(); aNPIter != aIter->second.end(); aNPIter++ )
+ for( list< NamePassRecord >::iterator aNPIter = aIter->second.begin(); aNPIter != aIter->second.end(); ++aNPIter )
if( aNPIter->GetUserName().equals( aName ) )
{
if( aNPIter->HasPasswords( PERSISTENT_RECORD ) )
@@ -1074,21 +1074,21 @@ void SAL_CALL PasswordContainer::removeAllPersistent() throw(RuntimeException)
if( !aNPIter->HasPasswords( MEMORY_RECORD ) )
{
list< NamePassRecord >::iterator aIterToDelete( aNPIter );
- aNPIter++;
+ ++aNPIter;
aIter->second.erase( aIterToDelete );
}
else
- aNPIter++;
+ ++aNPIter;
}
if( aIter->second.begin() == aIter->second.end() )
{
PassMap::iterator aIterToDelete( aIter );
- aIter++;
+ ++aIter;
m_aContainer.erase( aIterToDelete );
}
else
- aIter++;
+ ++aIter;
}
}
//-------------------------------------------------------------------------
@@ -1098,10 +1098,10 @@ Sequence< UrlRecord > SAL_CALL PasswordContainer::getAllPersistent( const Refere
Sequence< UrlRecord > aResult;
::osl::MutexGuard aGuard( mMutex );
- for( PassMap::iterator aIter = m_aContainer.begin(); aIter != m_aContainer.end(); aIter++ )
+ for( PassMap::iterator aIter = m_aContainer.begin(); aIter != m_aContainer.end(); ++aIter )
{
Sequence< UserRecord > aUsers;
- for( list< NamePassRecord >::iterator aNPIter = aIter->second.begin(); aNPIter != aIter->second.end(); aNPIter++ )
+ for( list< NamePassRecord >::iterator aNPIter = aIter->second.begin(); aNPIter != aIter->second.end(); ++aNPIter )
if( aNPIter->HasPasswords( PERSISTENT_RECORD ) )
{
sal_Int32 oldLen = aUsers.getLength();
@@ -1396,7 +1396,7 @@ void PasswordContainer::Notify()
PassMap::iterator aIter;
// remove the cached persistent values in the memory
- for( aIter = m_aContainer.begin(); aIter != m_aContainer.end(); aIter++ )
+ for( aIter = m_aContainer.begin(); aIter != m_aContainer.end(); ++aIter )
{
for( list< NamePassRecord >::iterator aNPIter = aIter->second.begin(); aNPIter != aIter->second.end(); )
{
@@ -1411,11 +1411,11 @@ void PasswordContainer::Notify()
if( !aNPIter->HasPasswords( MEMORY_RECORD ) )
{
list< NamePassRecord >::iterator aIterToDelete( aNPIter );
- aNPIter++;
+ ++aNPIter;
aIter->second.erase( aIterToDelete );
}
else
- aNPIter++;
+ ++aNPIter;
}
}
@@ -1423,11 +1423,11 @@ void PasswordContainer::Notify()
if( m_pStorageFile )
addon = m_pStorageFile->getInfo();
- for( aIter = addon.begin(); aIter != addon.end(); aIter++ )
+ for( aIter = addon.begin(); aIter != addon.end(); ++aIter )
{
PassMap::iterator aSearchIter = m_aContainer.find( aIter->first );
if( aSearchIter != m_aContainer.end() )
- for( list< NamePassRecord >::iterator aNPIter = aIter->second.begin(); aNPIter != aIter->second.end(); aNPIter++ )
+ for( list< NamePassRecord >::iterator aNPIter = aIter->second.begin(); aNPIter != aIter->second.end(); ++aNPIter )
UpdateVector( aSearchIter->first, aSearchIter->second, *aNPIter, sal_False );
else
m_aContainer.insert( PairUrlRecord( aIter->first, aIter->second ) );
commit 0055b13167788a8020f80185881f80c3ec81898c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Dec 24 13:31:59 2010 +0000
cppcheck: prefer prefix variant
diff --git a/ucbhelper/source/client/proxydecider.cxx b/ucbhelper/source/client/proxydecider.cxx
index 26b573a..eef912a 100644
--- a/ucbhelper/source/client/proxydecider.cxx
+++ b/ucbhelper/source/client/proxydecider.cxx
@@ -113,7 +113,7 @@ public:
rValue = (*it).second;
return true;
}
- it++;
+ ++it;
}
return false;
}
@@ -503,7 +503,7 @@ bool InternetProxyDecider_Impl::shouldUseProxy( const rtl::OUString & rHost,
if ( (*it).first.Matches( aHostAndPort ) )
return false;
}
- it++;
+ ++it;
}
return true;
commit 39a0581780b04293dcb0153f678bf3d7e5289e1c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Dec 24 13:25:24 2010 +0000
cppcheck: prefer prefix variant
diff --git a/toolkit/source/layout/core/import.cxx b/toolkit/source/layout/core/import.cxx
index f071301..e0ab1ff 100644
--- a/toolkit/source/layout/core/import.cxx
+++ b/toolkit/source/layout/core/import.cxx
@@ -288,7 +288,7 @@ void RadioGroups::RadioGroup::handleSelected ()
throw (uno::RuntimeException)
{
for ( RadioButtonsList::iterator it = mxRadios.begin();
- it != mxRadios.end(); it++ )
+ it != mxRadios.end(); ++it )
if ( *it != mxSelectedRadio && (*it)->getState() )
{
mxSelectedRadio->setState( false );
More information about the Libreoffice-commits
mailing list