Fix

Author: chrchr-github

lib/symboldatabase.cpp

@@ -1353,9 +1353,9 @@ void SymbolDatabase::createSymbolDatabaseSetVariablePointers()
             const Type *type = tok->function()->retType;
             Token* membertok;
             if (tok->linkAt(1)->strAt(1) == ".")
-                membertok = tok->linkAt(1)->next()->next();
+                membertok = tok->linkAt(1)->tokAt(2);
             else
-                membertok = tok->linkAt(1)->linkAt(1)->next()->next();
+                membertok = tok->linkAt(1)->linkAt(1)->tokAt(2);
             if (type) {
                 const Variable *membervar = membertok->variable();
                 if (!membervar) {

lib/tokenize.cpp

@@ -7786,7 +7786,7 @@ void Tokenizer::simplifyIfSwitchForInit()
         // Simplify, the initialization expression is broken out..
         semicolon->insertToken(tok->str());
         semicolon->next()->insertToken("(");
-        Token::createMutualLinks(semicolon->next()->next(), endpar);
+        Token::createMutualLinks(semicolon->tokAt(2), endpar);
         tok->deleteNext();
         tok->str("{");
         endscope->insertToken("}");

test/testtokenize.cpp

@@ -3297,15 +3297,15 @@ class TestTokenizer : public TestFixture {
             SimpleTokenizer tokenizer(settings0, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *A = Token::findsimplematch(tokenizer.tokens(), "A <");
-            ASSERT_EQUALS(true, A->next()->link() == A->tokAt(3));
+            ASSERT_EQUALS(true, A->linkAt(1) == A->tokAt(3));
         }
         {
             // #8851
             const char code[] = "template<typename std::enable_if<!(std::value1) && std::value2>::type>"
                                 "void basic_json() {}";
             SimpleTokenizer tokenizer(settings0, *this);
             ASSERT(tokenizer.tokenize(code));
-            ASSERT_EQUALS(true, Token::simpleMatch(tokenizer.tokens()->next()->link(), "> void"));
+            ASSERT_EQUALS(true, Token::simpleMatch(tokenizer.tokens()->linkAt(1), "> void"));
         }
 
         {
@@ -3325,8 +3325,8 @@ class TestTokenizer : public TestFixture {
             ASSERT(tokenizer.tokenize(code));
             const Token *tok1 = Token::findsimplematch(tokenizer.tokens(), "template <");
             const Token *tok2 = Token ::findsimplematch(tokenizer.tokens(), "same_as <");
-            ASSERT(tok1->next()->link() == tok1->tokAt(7));
-            ASSERT(tok2->next()->link() == tok2->tokAt(3));
+            ASSERT(tok1->linkAt(1) == tok1->tokAt(7));
+            ASSERT(tok2->linkAt(1) == tok2->tokAt(3));
         }
 
         {