Fixed bug where words from macros did not always go through settings …

…parsing.

- Due to WordTokens.newHash not getting set correctly.
    - Now getting a better default value and getting set as required.
    - Can think of option for better forced constructor.

Parsers/CppParser/cppdocumentprocessor.cpp

@@ -516,11 +516,12 @@ QVector<WordTokens> CppDocumentProcessor::parseMacros() const
      * macro due to edits before the macro can be handled using the hash
      * functionality.*/
     WordTokens tokens;
-    tokens.column = mac.utf16charsBegin() - start;
-    tokens.line   = line;
-    tokens.string = QString::fromUtf8( macroBytes.mid( int32_t( mac.utf16charsBegin() - start ) ) );
-    tokens.hash   = qHash( tokens.string );
-    tokens.type   = WordTokens::Type::Literal;
+    tokens.column  = mac.utf16charsBegin() - start;
+    tokens.line    = line;
+    tokens.string  = QString::fromUtf8( macroBytes.mid( int32_t( mac.utf16charsBegin() - start ) ) );
+    tokens.hash    = qHash( tokens.string );
+    tokens.type    = WordTokens::Type::Literal;
+    tokens.newHash = true;
 
     TmpOptional wordOpt = checkHash( tokens, tokens.hash );
     if( wordOpt.first == true ) {

Parsers/CppParser/cppdocumentprocessor.h

@@ -60,11 +60,11 @@ struct WordTokens
   };
 
   HashWords::key_type hash;
-  uint32_t line;
-  uint32_t column;
+  uint32_t line   = 0;
+  uint32_t column = 0;
   QString string;
   WordList words;
-  bool newHash;
+  bool newHash = true;
   Type type;
 };