From 0e82730ee4042a7b23774a180c8e666e094cbbf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Tue, 28 Jul 2015 14:34:37 +0200
Subject: [PATCH] addons/naming.py: fixed error report for function name

---
 addons/cppcheckdata.py | 5 ++++-
 addons/naming.py       | 2 +-
 lib/symboldatabase.cpp | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/cppcheckdata.py b/addons/cppcheckdata.py
index 34d2927e1..8da52472b 100644
--- a/addons/cppcheckdata.py
+++ b/addons/cppcheckdata.py
@@ -171,10 +171,13 @@ class Function:
     Id = None
     argument = None
     argumentId = None
+    tokenDef = None
+    tokenDefId = None
     name = None
 
     def __init__(self, element):
         self.Id = element.get('id')
+        self.tokenDefId = element.get('tokenDef')
         self.name = element.get('name')
         self.argument = {}
         self.argumentId = {}
@@ -184,7 +187,7 @@ class Function:
     def setId(self, IdMap):
         for argnr, argid in self.argumentId.items():
             self.argument[argnr] = IdMap[argid]
-
+        self.tokenDef = IdMap[self.tokenDefId]
 
 class Variable:
     Id = None
diff --git a/addons/naming.py b/addons/naming.py
index fd94aeeb6..22022a457 100644
--- a/addons/naming.py
+++ b/addons/naming.py
@@ -30,4 +30,4 @@ for arg in sys.argv[1:]:
     for function in data.functions:
       res = re.match(RE_FUNCTIONNAME, function.name)
       if not res:
-        reportError(var.typeStartToken, 'style', 'Function ' + function.name + ' violates naming convention')
+        reportError(function.tokenDef, 'style', 'Function ' + function.name + ' violates naming convention')
diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
index 511fd97be..6509c1dca 100644
--- a/lib/symboldatabase.cpp
+++ b/lib/symboldatabase.cpp
@@ -2471,7 +2471,7 @@ void SymbolDatabase::printXml(std::ostream &out) const
             if (!scope->functionList.empty()) {
                 out << "      <functionList>" << std::endl;
                 for (std::list<Function>::const_iterator function = scope->functionList.begin(); function != scope->functionList.end(); ++function) {
-                    out << "        <function id=\"" << &*function << "\" name=\"" << function->name() << '\"';
+                    out << "        <function id=\"" << &*function << "\" tokenDef=\"" << function->tokenDef << "\" name=\"" << function->name() << '\"';
                     if (function->argCount() == 0U)
                         out << "/>" << std::endl;
                     else {