From aa60358458ab339b59909860a6afe2cec958872b Mon Sep 17 00:00:00 2001
From: Dmitry-Me <wipedout@yandex.ru>
Date: Tue, 15 Sep 2015 15:34:12 +0300
Subject: [PATCH] Temp variables, better names

---
 lib/checkio.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/checkio.cpp b/lib/checkio.cpp
index 7ff94c7ed..62ee75b3a 100644
--- a/lib/checkio.cpp
+++ b/lib/checkio.cpp
@@ -1523,16 +1523,18 @@ bool CheckIO::ArgumentInfo::isStdVectorOrString()
         typeToken = tempToken;
         return true;
     } else if (variableInfo->type() && !variableInfo->type()->derivedFrom.empty()) {
-        for (std::size_t i = 0, e = variableInfo->type()->derivedFrom.size(); i != e; ++i) {
-            if (Token::Match(variableInfo->type()->derivedFrom[i].nameTok, "std :: vector|array <")) {
-                typeToken = variableInfo->type()->derivedFrom[i].nameTok->tokAt(4);
+        const std::vector<Type::BaseInfo>& derivedFrom = variableInfo->type()->derivedFrom;
+        for (std::size_t i = 0, size = derivedFrom.size(); i < size; ++i) {
+            const Token* nameTok = derivedFrom[i].nameTok;
+            if (Token::Match(nameTok, "std :: vector|array <")) {
+                typeToken = nameTok->tokAt(4);
                 _template = true;
                 return true;
-            } else if (Token::Match(variableInfo->type()->derivedFrom[i].nameTok, "std :: string|wstring")) {
+            } else if (Token::Match(nameTok, "std :: string|wstring")) {
                 tempToken = new Token(0);
                 tempToken->fileIndex(variableInfo->typeStartToken()->fileIndex());
                 tempToken->linenr(variableInfo->typeStartToken()->linenr());
-                if (variableInfo->type()->derivedFrom[i].nameTok->strAt(2) == "string")
+                if (nameTok->strAt(2) == "string")
                     tempToken->str("char");
                 else
                     tempToken->str("wchar_t");
@@ -1583,7 +1585,7 @@ bool CheckIO::ArgumentInfo::isStdContainer(const Token *tok)
             return true;
         } else if (variable->type() && !variable->type()->derivedFrom.empty()) {
             const std::vector<Type::BaseInfo>& derivedFrom = variable->type()->derivedFrom;
-            for (std::size_t i = 0, e = derivedFrom.size(); i != e; ++i) {
+            for (std::size_t i = 0, size = derivedFrom.size(); i < size; ++i) {
                 const Token* nameTok = derivedFrom[i].nameTok;
                 if (Token::Match(nameTok, "std :: vector|array|bitset|deque|list|forward_list|map|multimap|multiset|priority_queue|queue|set|stack|hash_map|hash_multimap|hash_set|unordered_map|unordered_multimap|unordered_set|unordered_multiset <")) {
                     typeToken = nameTok->tokAt(4);