[Libreoffice-commits] .: toolkit/workben

Caolán McNamara caolan at kemper.freedesktop.org
Sat Jan 1 12:49:24 PST 2011


 toolkit/workben/layout/editor.cxx |   24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 3f66cf88c9b1cbbd7842dbaba1ab39094e4e24dd
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Jan 1 20:49:19 2011 +0000

    cppcheck: prefer prefix variant

diff --git a/toolkit/workben/layout/editor.cxx b/toolkit/workben/layout/editor.cxx
index 509cdc8..4b41ded 100644
--- a/toolkit/workben/layout/editor.cxx
+++ b/toolkit/workben/layout/editor.cxx
@@ -215,7 +215,7 @@ public:
     ~Widget()
     {
         for ( std::vector< Widget *>::const_iterator it = maChildren.begin();
-             it != maChildren.end(); it++ )
+             it != maChildren.end(); ++it )
             delete *it;
         if ( !mbForeign )
         {
@@ -366,18 +366,18 @@ public:
         std::vector< Widget *> aChildChildren = pChild->maChildren;
 
         for ( std::vector< Widget *>::const_iterator it = aChildChildren.begin();
-              it != aChildChildren.end(); it++ )
+              it != aChildChildren.end(); ++it )
             pChild->removeChild( *it );
 
         for ( std::vector< Widget *>::const_iterator it = aChildChildren.begin();
-              it != aChildChildren.end(); it++ )
+              it != aChildChildren.end(); ++it )
             if ( !addChild( *it ) )
             {    // failure
                 for ( std::vector< Widget *>::const_iterator jt = aChildChildren.begin();
-                      jt != it; jt++ )
+                      jt != it; ++jt )
                     removeChild( *jt );
                 for ( std::vector< Widget *>::const_iterator jt = aChildChildren.begin();
-                      jt != aChildChildren.end(); jt++ )
+                      jt != aChildChildren.end(); ++jt )
                     pChild->addChild( *jt );
                 return false;
             }
@@ -397,7 +397,7 @@ public:
     {
         int i = 0;
         for ( std::vector< Widget *>::const_iterator it = maChildren.begin();
-              it != maChildren.end(); it++, i++ )
+              it != maChildren.end(); ++it, ++i )
             if ( *it == pChild )
                 break;
         return i;
@@ -434,7 +434,7 @@ public:
 
     static rtl::OUString findProperty( const PropList &props, rtl::OUString propName )
     {
-        for ( PropList::const_iterator it = props.begin(); it != props.end(); it++ )
+        for ( PropList::const_iterator it = props.begin(); it != props.end(); ++it )
             if ( it->first.equalsIgnoreAsciiCase( propName ) )
                 return it->second;
 #if DEBUG_PRINT
@@ -1211,7 +1211,7 @@ public:
         Container::Clear();
 
         for ( std::list< PropertyEntry* >::iterator it = maPropertiesList.begin();
-              it != maPropertiesList.end(); it++)
+              it != maPropertiesList.end(); ++it)
             delete *it;
         maPropertiesList.clear();
 
@@ -1690,7 +1690,7 @@ EditorImpl::~EditorImpl()
     delete mpPropertiesList;
     delete mpLayoutTree;
     for ( std::list< layout::PushButton * >::const_iterator i = maCreateButtons.begin();
-          i != maCreateButtons.end(); i++)
+          i != maCreateButtons.end(); ++i)
         delete *i;
     delete pImportButton;
     delete pExportButton;
@@ -1770,13 +1770,13 @@ void EditorImpl::widgetSelected( Widget *pWidget )
     if ( !pWidget || pWidget->isContainer() )
     {
         for ( std::list< layout::PushButton *>::const_iterator it = maCreateButtons.begin();
-              it != maCreateButtons.end(); it++)
+              it != maCreateButtons.end(); ++it)
             (*it)->Enable();
     }
     else
     {
         for ( std::list< layout::PushButton *>::const_iterator it = maCreateButtons.begin();
-              it != maCreateButtons.end(); it++)
+              it != maCreateButtons.end(); ++it)
             (*it)->Disable();
     }
 
@@ -1787,7 +1787,7 @@ IMPL_LINK( EditorImpl, CreateWidgetHdl, layout::Button *, pBtn )
 {
     int i = 0;
     for ( std::list< layout::PushButton *>::const_iterator it = maCreateButtons.begin();
-          it != maCreateButtons.end(); it++, i++ )
+          it != maCreateButtons.end(); ++it, ++i )
     {
         if ( pBtn == *it )
             break;


More information about the Libreoffice-commits mailing list