From eeb281daf6c8d541157478a0994ccddd83158651 Mon Sep 17 00:00:00 2001
From: Daniel <daniel@daniel-desktop.(none)>
Date: Wed, 21 Oct 2009 20:15:11 +0200
Subject: [PATCH] Fixed #830 (id 'pushback' used twice)

---
 src/checkstl.cpp | 12 ++++++------
 src/checkstl.h   |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/checkstl.cpp b/src/checkstl.cpp
index a569c60a9..5641ecc5e 100644
--- a/src/checkstl.cpp
+++ b/src/checkstl.cpp
@@ -372,7 +372,7 @@ void CheckStl::pushback()
                         }
 
                         if (pushback)
-                            pushbackError(pushback, pushback->str(), tok2->strAt(0));
+                            invalidIteratorError(pushback, pushback->str(), tok2->strAt(0));
                     }
 
                     // Assigning iterator..
@@ -393,9 +393,9 @@ void CheckStl::pushback()
                     if (!invalidIterator.empty())
                     {
                         if (Token::Match(tok2, "++|--|*|+|-|(|,|=|!= %varid%", iteratorid))
-                            pushbackError(tok2, invalidIterator, tok2->strAt(1));
+                            invalidIteratorError(tok2, invalidIterator, tok2->strAt(1));
                         if (Token::Match(tok2, "%varid% ++|--|+|-", iteratorid))
-                            pushbackError(tok2, invalidIterator, tok2->str());
+                            invalidIteratorError(tok2, invalidIterator, tok2->str());
                     }
                 }
             }
@@ -405,16 +405,16 @@ void CheckStl::pushback()
 
 
 // Error message for bad iterator usage..
-void CheckStl::pushbackError(const Token *tok, const std::string &func, const std::string &iterator_name)
+void CheckStl::invalidIteratorError(const Token *tok, const std::string &func, const std::string &iterator_name)
 {
-    reportError(tok, Severity::error, "pushback", "After " + func + ", the iterator '" + iterator_name + "' may be invalid");
+    reportError(tok, Severity::error, "invalidIterator", "After " + func + ", the iterator '" + iterator_name + "' may be invalid");
 }
 
 
 // Error message for bad iterator usage..
 void CheckStl::invalidPointerError(const Token *tok, const std::string &pointer_name)
 {
-    reportError(tok, Severity::error, "pushback", "Invalid pointer '" + pointer_name + "' after push_back / push_front");
+    reportError(tok, Severity::error, "invalidPointer", "Invalid pointer '" + pointer_name + "' after push_back / push_front");
 }
 
 
diff --git a/src/checkstl.h b/src/checkstl.h
index 2bb59d40c..b5114ab51 100644
--- a/src/checkstl.h
+++ b/src/checkstl.h
@@ -105,7 +105,7 @@ private:
     void iteratorsError(const Token *tok, const std::string &container1, const std::string &container2);
     void mismatchingContainersError(const Token *tok);
     void eraseError(const Token *tok);
-    void pushbackError(const Token *tok, const std::string &func, const std::string &iterator_name);
+    void invalidIteratorError(const Token *tok, const std::string &func, const std::string &iterator_name);
     void invalidPointerError(const Token *tok, const std::string &pointer_name);
     void stlBoundriesError(const Token *tok, const std::string &container_name);
 
@@ -116,7 +116,7 @@ private:
         dereferenceErasedError(0, "iter");
         stlOutOfBoundsError(0, "i", "foo");
         eraseError(0);
-        pushbackError(0, "push_back|push_front|insert", "iterator");
+        invalidIteratorError(0, "push_back|push_front|insert", "iterator");
         invalidPointerError(0, "pointer");
         stlBoundriesError(0, "container");
     }