From 25847fdec47c87c5501da55e4a5667d441664fa5 Mon Sep 17 00:00:00 2001
From: Reijo Tomperi <aggro80@users.sourceforge.net>
Date: Mon, 8 Dec 2008 17:45:55 +0000
Subject: [PATCH] Refactoring: TOKEN::varId was moved from public to private

---
 testtokenize.cpp | 10 +++++-----
 token.cpp        | 10 ++++++++++
 token.h          |  5 ++++-
 tokenize.cpp     |  4 ++--
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/testtokenize.cpp b/testtokenize.cpp
index cd65aab3e..d50c80241 100644
--- a/testtokenize.cpp
+++ b/testtokenize.cpp
@@ -284,15 +284,15 @@ private:
         for ( const TOKEN *tok = tokenizer.tokens(); tok; tok = tok->next )
         {
             if ( tok->str() != "i" )
-                ASSERT_EQUALS( 0, tok->varId );
+                ASSERT_EQUALS( 0, tok->varId() );
             else if ( TOKEN::Match(tok, "i = 1") )
-                ASSERT_EQUALS( 1, tok->varId );
+                ASSERT_EQUALS( 1, tok->varId() );
             else if ( TOKEN::Match(tok, "i = 2") )
-                ASSERT_EQUALS( 2, tok->varId );
+                ASSERT_EQUALS( 2, tok->varId() );
             else if ( TOKEN::Match(tok, "i = 3") )
-                ASSERT_EQUALS( 3, tok->varId );
+                ASSERT_EQUALS( 3, tok->varId() );
             else if ( TOKEN::Match(tok, "i = 4") )
-                ASSERT_EQUALS( 2, tok->varId );
+                ASSERT_EQUALS( 2, tok->varId() );
         }
     }
 };
diff --git a/token.cpp b/token.cpp
index f9ebd234d..ffd646e7a 100644
--- a/token.cpp
+++ b/token.cpp
@@ -307,3 +307,13 @@ const TOKEN *TOKEN::findtoken(const TOKEN *tok1, const char *tokenstr[])
     }
     return NULL;
 }
+
+unsigned int TOKEN::varId() const
+{
+    return _varId;
+}
+
+void TOKEN::varId( unsigned int id )
+{
+    _varId = id;
+}
diff --git a/token.h b/token.h
index b5be39699..2ef2a12f3 100644
--- a/token.h
+++ b/token.h
@@ -114,15 +114,18 @@ public:
     unsigned int FileIndex;
     unsigned int linenr;
 
-    unsigned int varId;
+
 
     TOKEN *next;
+    unsigned int varId() const;
+    void varId( unsigned int id );
 
 private:
     std::string _str;
     char * _cstr;
     bool _isName;
     bool _isNumber;
+    unsigned int _varId;
 };
 
 #endif // TOKEN_H
diff --git a/tokenize.cpp b/tokenize.cpp
index 78eff4c8d..ee3ec3f5d 100644
--- a/tokenize.cpp
+++ b/tokenize.cpp
@@ -624,7 +624,7 @@ void Tokenizer::setVarId()
 {
     // Clear all variable ids
     for ( TOKEN *tok = _tokens; tok; tok = tok->next )
-        tok->varId = 0;
+        tok->varId( 0 );
 
     // Set variable ids..
     unsigned int _varId = 0;
@@ -654,7 +654,7 @@ void Tokenizer::setVarId()
             for ( tok2 = tok->next; tok2 && indentlevel >= 0; tok2 = tok2->next )
             {
                 if ( tok2->str() == varname )
-                    tok2->varId = _varId;
+                    tok2->varId( _varId );
                 else if ( tok2->str() == "{" )
                     ++indentlevel;
                 else if ( tok2->str() == "}" )