[Libreoffice-commits] .: basctl/source forms/source l10ntools/layout

Julien Nabet serval2412 at kemper.freedesktop.org
Mon Aug 8 15:17:31 PDT 2011


 basctl/source/dlged/dlgedobj.cxx |    8 ++++----
 forms/source/xforms/binding.cxx  |    2 +-
 l10ntools/layout/layoutparse.cxx |    2 +-
 l10ntools/layout/tralay.cxx      |    6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit da41ba97d3ac0eb751dfc4b716bd594d1670c77e
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Tue Aug 9 00:17:54 2011 +0200

    Some cppcheck cleaning

diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index 315b4a4..cff3e08 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -1531,7 +1531,7 @@ void DlgEdForm::PositionAndSizeChange( const beans::PropertyChangeEvent& evt )
                 nPageHeightIn = aPageSize.Height();
                 if ( TransformSdrToControlCoordinates( nPageXIn, nPageYIn, nPageWidthIn, nPageHeightIn, nPageX, nPageY, nPageWidth, nPageHeight ) )
                 {
-                    for ( aIter = aChildList.begin(); aIter != aChildList.end(); aIter++ )
+                    for ( aIter = aChildList.begin(); aIter != aChildList.end(); ++aIter )
                     {
                         Reference< beans::XPropertySet > xPSet( (*aIter)->GetUnoControlModel(), UNO_QUERY );
                         if ( xPSet.is() )
@@ -1578,7 +1578,7 @@ void DlgEdForm::PositionAndSizeChange( const beans::PropertyChangeEvent& evt )
                 }
             }
 
-            for ( aIter = aChildList.begin(); aIter != aChildList.end(); aIter++ )
+            for ( aIter = aChildList.begin(); aIter != aChildList.end(); ++aIter )
             {
                 (*aIter)->SetRectFromProps();
             }
@@ -1780,7 +1780,7 @@ void DlgEdForm::NbcMove( const Size& rSize )
 
     // set geometry properties of all childs
     ::std::vector<DlgEdObj*>::iterator aIter;
-    for ( aIter = pChilds.begin() ; aIter != pChilds.end() ; aIter++ )
+    for ( aIter = pChilds.begin() ; aIter != pChilds.end() ; ++aIter )
     {
         (*aIter)->EndListening(sal_False);
         (*aIter)->SetPropsFromRect();
@@ -1804,7 +1804,7 @@ void DlgEdForm::NbcResize(const Point& rRef, const Fraction& xFract, const Fract
 
     // set geometry properties of all childs
     ::std::vector<DlgEdObj*>::iterator aIter;
-    for ( aIter = pChilds.begin() ; aIter != pChilds.end() ; aIter++ )
+    for ( aIter = pChilds.begin() ; aIter != pChilds.end() ; ++aIter )
     {
         (*aIter)->EndListening(sal_False);
         (*aIter)->SetPropsFromRect();
diff --git a/forms/source/xforms/binding.cxx b/forms/source/xforms/binding.cxx
index 7389eab..2628723 100644
--- a/forms/source/xforms/binding.cxx
+++ b/forms/source/xforms/binding.cxx
@@ -661,7 +661,7 @@ void Binding::bind( bool bForceRebind )
     ::std::vector<EvaluationContext> aMIPContexts = _getMIPEvaluationContexts();
     for( ::std::vector<EvaluationContext>::iterator aIter = aMIPContexts.begin();
          aIter != aMIPContexts.end();
-         aIter++ )
+         ++aIter )
     {
         EvaluationContext& rContext = *aIter;
 
diff --git a/l10ntools/layout/layoutparse.cxx b/l10ntools/layout/layoutparse.cxx
index d3d80b6..1d8473c 100644
--- a/l10ntools/layout/layoutparse.cxx
+++ b/l10ntools/layout/layoutparse.cxx
@@ -74,7 +74,7 @@ LayoutXMLFile::HandleElement( XMLElement* element )
 {
     std::vector<XMLAttribute*> interesting = interestingAttributes( element->GetAttributeList() );
 
-    if ( interesting.size() )
+    if ( !interesting.empty() )
     {
         std::vector<XMLAttribute*>::iterator i = interesting.begin();
 
diff --git a/l10ntools/layout/tralay.cxx b/l10ntools/layout/tralay.cxx
index e8c6144..fa3086a 100644
--- a/l10ntools/layout/tralay.cxx
+++ b/l10ntools/layout/tralay.cxx
@@ -156,7 +156,7 @@ void TranslateLayout::ParseCommandLine()
         else
             mFiles.push_back( ConvertSystemPath( aParam ) );
     }
-    if ( !mFiles.size() )
+    if ( mFiles.empty() )
     {
         fprintf( stderr, "error: No XML-FILE found\n" );
         usage();
@@ -325,7 +325,7 @@ void TranslateLayout::MergeLanguage( ByteString const& language )
 
 void TranslateLayout::Merge()
 {
-    if ( mLanguages.size() )
+    if (!mLanguages.empty() )
         for ( std::vector<ByteString>::iterator i = mLanguages.begin();
               i != mLanguages.end(); ++i)
             MergeLanguage( *i );
@@ -351,7 +351,7 @@ void TranslateLayout::CreateSDF()
 void TranslateLayout::ExceptionalMain()
 {
     ParseCommandLine();
-    if ( mLanguages.size() )
+    if ( !mLanguages.empty() )
         mLanguage = mLanguages.front();
     if ( mMergeMode )
         Merge();


More information about the Libreoffice-commits mailing list