Improving code efficiency by errors from cppcheck

avogadro/core/angleiterator.cpp

@@ -16,7 +16,8 @@ using namespace std;
 
 AngleIterator::AngleIterator(const Molecule* mol)
   : m_current(0, 0, 0), m_mol(mol)
-{}
+{
+}
 
 Angle AngleIterator::begin()
 {
@@ -44,15 +45,14 @@ Angle AngleIterator::operator++()
       if (valid) {
         // we have a valid current angle, try to find a new edge
         for (const auto maybeC : graph.neighbors(b)) {
-          if (maybeC != a 
-            && (!valid || maybeC > c)) {
+          if (maybeC != a && maybeC > c) {
             m_current = make_tuple(a, b, maybeC);
             return m_current;
           }
 
-        }               // end "c" loop
+        }              // end "c" loop
         valid = false; // we couldn't find a "c", so find a new "a"
-      }               // end if()
+      }                // end if()
 
       // can we find a new edge?
       for (const auto maybeA : graph.neighbors(b)) {
@@ -67,13 +67,13 @@ Angle AngleIterator::operator++()
       // if we don't have a valid "a", move out to find a new "b"
     } while (valid);
 
-    while(!valid && b + 1 < count) {
+    while (!valid && b + 1 < count) {
       ++b; // try going to the next atom
 
       const auto neighbors = graph.neighbors(b);
       if (neighbors.size() < 2)
         continue;
-      
+
       a = neighbors[0];
       c = neighbors[0]; // we'll move to the next one in the loop
       valid = true;
@@ -84,4 +84,4 @@ Angle AngleIterator::operator++()
   return make_tuple(MaxIndex, MaxIndex, MaxIndex);
 } // end ++ operator
 
-} // namespace Avogadro
+} // namespace Avogadro::Core

avogadro/core/angleiterator.h

@@ -10,8 +10,8 @@
 
 #include "avogadrocore.h"
 
-#include <vector>
 #include <tuple>
+#include <vector>
 
 namespace Avogadro {
 namespace Core {
@@ -26,28 +26,25 @@ class AVOGADROCORE_EXPORT AngleIterator
   /**
    * Constructor.
    */
-  explicit AngleIterator(const Molecule *mol);
+  explicit AngleIterator(const Molecule* mol);
 
   ~AngleIterator() {}
 
-  Angle* operator*() {
-    return &m_current;
-  }
+  Angle* operator*() { return &m_current; }
 
   Angle begin();
 
-  Angle end() const {
-    return std::make_tuple(MaxIndex, MaxIndex, MaxIndex);
-  }
+  Angle end() const { return std::make_tuple(MaxIndex, MaxIndex, MaxIndex); }
 
   Angle operator++();
 
-  bool operator!=(const AngleIterator& other ) {
+  bool operator!=(const AngleIterator& other)
+  {
     return m_current != other.m_current;
   }
 
 private:
-  Angle     m_current;
+  Angle m_current;
   const Molecule* m_mol;
 };