[Libreoffice-commits] .: basic/workben desktop/source drawinglayer/source
Julien Nabet
serval2412 at kemper.freedesktop.org
Fri Apr 22 08:45:31 PDT 2011
basic/workben/mgrtest.cxx | 1
desktop/source/deployment/gui/dp_gui_updatedialog.cxx | 2 -
desktop/source/deployment/manager/dp_extensionmanager.cxx | 8 +++----
desktop/source/deployment/registry/dp_backenddb.cxx | 2 -
desktop/source/pkgchk/unopkg/unopkg_misc.cxx | 2 -
drawinglayer/source/primitive2d/metafileprimitive2d.cxx | 16 +++++++-------
6 files changed, 15 insertions(+), 16 deletions(-)
New commits:
commit 6efa0960b505418287a618030acefa5a49c46375
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Fri Apr 22 15:37:54 2011 +0200
Some cppcheck cleaning
diff --git a/basic/workben/mgrtest.cxx b/basic/workben/mgrtest.cxx
index 824966b..b894622 100644
--- a/basic/workben/mgrtest.cxx
+++ b/basic/workben/mgrtest.cxx
@@ -526,7 +526,6 @@ void __EXPORT TestWindow::Resize()
void __EXPORT TestWindow::KeyInput( const KeyEvent& rKEvt )
{
- char nCharCode = rKEvt.GetCharCode();
sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode();
// Nur bei Alt-Return
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index 8b73e6b..5820b74 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -1381,7 +1381,7 @@ IMPL_LINK(UpdateDialog, okHandler, void *, EMPTYARG)
//If users are going to update a shared extension then we need
//to warn them
typedef ::std::vector<UpdateData>::const_iterator CIT;
- for (CIT i = m_enabledUpdates.begin(); i < m_enabledUpdates.end(); i++)
+ for (CIT i = m_enabledUpdates.begin(); i < m_enabledUpdates.end(); ++i)
{
OSL_ASSERT(i->aInstalledPackage.is());
//If the user has no write access to the shared folder then the update
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index e2fe27e..cd21b08 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -102,7 +102,7 @@ OUString CompIdentifiers::getName(::std::vector<Reference<deploy::XPackage> > co
//get the first non-null reference
Reference<deploy::XPackage> extension;
::std::vector<Reference<deploy::XPackage> >::const_iterator it = a.begin();
- for (; it != a.end(); it++)
+ for (; it != a.end(); ++it)
{
if (it->is())
{
@@ -250,13 +250,13 @@ void ExtensionManager::addExtensionsToMap(
::std::list<OUString>::const_iterator citNames =
m_repositoryNames.begin();
int index = 0;
- for (;citNames != m_repositoryNames.end(); citNames++, index++)
+ for (;citNames != m_repositoryNames.end(); ++citNames, ++index)
{
if (citNames->equals(repository))
break;
}
- for (int i = 0; i < seqExt.getLength(); i++)
+ for (int i = 0; i < seqExt.getLength(); ++i)
{
Reference<deploy::XPackage> const & xExtension = seqExt[i];
OUString id = dp_misc::getIdentifier(xExtension);
@@ -333,7 +333,7 @@ ExtensionManager::getExtensionsWithSameIdentifier(
//throw an IllegalArgumentException if there is no extension at all.
typedef ::std::list<Reference<deploy::XPackage> >::const_iterator CIT;
- for (CIT i = listExtensions.begin(); i != listExtensions.end(); i++)
+ for (CIT i = listExtensions.begin(); i != listExtensions.end(); ++i)
bHasExtension |= i->is();
if (!bHasExtension)
throw lang::IllegalArgumentException(
diff --git a/desktop/source/deployment/registry/dp_backenddb.cxx b/desktop/source/deployment/registry/dp_backenddb.cxx
index 4a84ee9..0c93502 100644
--- a/desktop/source/deployment/registry/dp_backenddb.cxx
+++ b/desktop/source/deployment/registry/dp_backenddb.cxx
@@ -429,7 +429,7 @@ void BackendDb::writeSimpleList(
listNode, css::uno::UNO_QUERY_THROW));
typedef ::std::list<OUString>::const_iterator ITC_ITEMS;
- for (ITC_ITEMS i = list.begin(); i != list.end(); i++)
+ for (ITC_ITEMS i = list.begin(); i != list.end(); ++i)
{
const Reference<css::xml::dom::XNode> memberNode(
doc->createElementNS(sNameSpace, sPrefix + sMemberTagName), css::uno::UNO_QUERY_THROW);
diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
index 33192eb..1a87c92 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
@@ -355,7 +355,7 @@ void printf_packages(
{
typedef ::std::vector< Reference<deployment::XPackage> >::const_iterator I_EXT;
int index = 0;
- for (I_EXT i = allExtensions.begin(); i != allExtensions.end(); i++, index++)
+ for (I_EXT i = allExtensions.begin(); i != allExtensions.end(); ++i, ++index)
{
if (vecUnaccepted[index])
printf_unaccepted_licenses(*i);
diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index 2178d0a..c1826a0 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -365,7 +365,7 @@ namespace
~PropertyHolders()
{
- while(maPropertyHolders.size())
+ while(!maPropertyHolders.empty())
{
delete maPropertyHolders.back();
maPropertyHolders.pop_back();
@@ -527,7 +527,7 @@ namespace
void Pop()
{
OSL_ENSURE(maTargetHolders.size(), "TargetHolders: POP with no property holders (!)");
- if(maTargetHolders.size())
+ if(!maTargetHolders.empty())
{
delete maTargetHolders.back();
maTargetHolders.pop_back();
@@ -542,7 +542,7 @@ namespace
~TargetHolders()
{
- while(maTargetHolders.size())
+ while(!maTargetHolders.empty())
{
delete maTargetHolders.back();
maTargetHolders.pop_back();
@@ -632,7 +632,7 @@ namespace
PropertyHolder& rProperties,
basegfx::BColor aBColor)
{
- if(rPositions.size())
+ if(!rPositions.empty())
{
if(rProperties.getTransformation().isIdentity())
{
@@ -1589,7 +1589,7 @@ namespace
}
}
- if(aTargetVector.size())
+ if(!aTargetVector.empty())
{
// add created text primitive to target
if(rProperty.getTransformation().isIdentity())
@@ -1687,7 +1687,7 @@ namespace
if(pA->GetColor() != aLastColor)
{
- if(aPositions.size())
+ if(!aPositions.empty())
{
createPointArrayPrimitive(aPositions, rTargetHolders.Current(), rPropertyHolders.Current(), aLastColor.getBColor());
aPositions.clear();
@@ -1703,7 +1703,7 @@ namespace
nAction--;
- if(aPositions.size())
+ if(!aPositions.empty())
{
createPointArrayPrimitive(aPositions, rTargetHolders.Current(), rPropertyHolders.Current(), aLastColor.getBColor());
}
@@ -1727,7 +1727,7 @@ namespace
nAction--;
- if(aPositions.size())
+ if(!aPositions.empty())
{
createPointArrayPrimitive(aPositions, rTargetHolders.Current(), rPropertyHolders.Current(), rPropertyHolders.Current().getLineColor());
}
More information about the Libreoffice-commits
mailing list