Refs #4473. cppcheck warnings.

mantidproject · Apr 27, 2012 · af5ea72 · af5ea72
1 parent 6056279
commit af5ea72
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/Code/Mantid/Framework/Crystal/src/SCDCalibratePanels.cpp b/Code/Mantid/Framework/Crystal/src/SCDCalibratePanels.cpp
@@ -168,7 +168,7 @@ namespace Crystal
      set< string >::iterator setIt = pnamesSv.begin();
      int N = 0;
 
-     for(  ;setIt != pnamesSv.end(); setIt++ )
+     for(  ;setIt != pnamesSv.end(); ++setIt )
      {
        string name = (*setIt);
        vector< V3D > posParams = component->getPositionParameter(name , false);
@@ -326,7 +326,7 @@ namespace Crystal
 
     if( Grouping == "OnePanelPerGroup" )
     {
-      for( set< string >::iterator it = AllBankNames.begin(); it != AllBankNames.end(); it++ )
+      for( set< string >::iterator it = AllBankNames.begin(); it != AllBankNames.end(); ++it )
       {
         string bankName = (*it);
         vector< string > vbankName;
@@ -336,7 +336,7 @@ namespace Crystal
 
       }else if( Grouping == "AllPanelsInOneGroup" )
       {  vector< string > vbankName;
-         for( set< string >::iterator it = AllBankNames.begin(); it != AllBankNames.end(); it++ )
+         for( set< string >::iterator it = AllBankNames.begin(); it != AllBankNames.end(); ++it )
             {
               string bankName = (*it);
 
@@ -470,7 +470,7 @@ namespace Crystal
     boost::shared_ptr<ParameterMap> pmap1( new ParameterMap());
 
     for( vector< string >::iterator vit = AllBankNames.begin();
-                                  vit != AllBankNames.end(); vit++ )
+                                  vit != AllBankNames.end(); ++vit )
     {
       string bankName = (*vit);
       updateBankParams( instrument->getComponentByName(bankName), pmap1, pmap0);
@@ -647,10 +647,10 @@ namespace Crystal
 
     vector< string >banksVec;
     vector<vector< string > >::iterator it;
-    for(  it = Groups.begin(); it != Groups.end(); it++ )
+    for(  it = Groups.begin(); it != Groups.end(); ++it )
     {
 
-      for( vector< string >::iterator itt = (*it).begin(); itt!=(*it).end(); itt++ )
+      for( vector< string >::iterator itt = (*it).begin(); itt!=(*it).end(); ++itt )
       {
         banksVec.push_back( (*itt) );
       }
@@ -703,14 +703,14 @@ namespace Crystal
 //------------------- For each Group set up Function, --------------------------
 //---------------Ties, and Constraint Properties for Fit algorithm--------------------
 
-   for( vector<vector< string > >::iterator itv = Groups.begin(); itv !=Groups.end(); itv++)
+   for( vector<vector< string > >::iterator itv = Groups.begin(); itv !=Groups.end(); ++itv)
    {
      i++;
      string BankNameString = "";
      boost::shared_ptr<const RectangularDetector> bank_rect;
 
     //---------------- Set up list of bank names argument -----------------
-    for( vector< string >::iterator it1 = (*itv).begin(); it1 !=(*itv).end(); it1++)
+    for( vector< string >::iterator it1 = (*itv).begin(); it1 !=(*itv).end(); ++it1)
     {
 
      boost::shared_ptr<const IComponent> bank_cmp = instrument->getComponentByName((*it1));
@@ -1041,12 +1041,12 @@ namespace Crystal
 
 
     i = -1;
-    for( vector<vector< string > >::iterator itv = Groups.begin(); itv != Groups.end(); itv++ )
+    for( vector<vector< string > >::iterator itv = Groups.begin(); itv != Groups.end(); ++itv )
     {
       i++;
       string BankNameString = "";
       boost::shared_ptr<const RectangularDetector> bank_rect;
-     for( vector< string >::iterator it1 = (*itv).begin(); it1 !=(*itv).end(); it1++ )
+     for( vector< string >::iterator it1 = (*itv).begin(); it1 !=(*itv).end(); ++it1 )
      {
 
       string bankName = (*it1);

diff --git a/Code/Mantid/Framework/Kernel/src/CompositeValidator.cpp b/Code/Mantid/Framework/Kernel/src/CompositeValidator.cpp
@@ -41,13 +41,14 @@ namespace Mantid
       // empty or single set of allowed values
       if(n_combinations<2)return elem_unique;
       // there is more then one combination and we have to identify its union;
-      for(std::set<std::string>::const_iterator its=elem_unique.begin();its!=elem_unique.end();its++)
+      for(std::set<std::string>::const_iterator its=elem_unique.begin();its!=elem_unique.end();++its)
       {
         std::multiset<std::string>::iterator im = elem_all.find(*its);
         elem_all.erase(im);
       }
       std::set<std::string> rez;
-      for(std::multiset<std::string>::const_iterator im=elem_all.begin();im!=elem_all.end();im++){
+      for(std::multiset<std::string>::const_iterator im=elem_all.begin();im!=elem_all.end();++im)
+      {
         rez.insert(*im);
       }
       return rez;