C++: Give NamespaceVariables a qualified name

Author: ian-semmle

cpp/ql/src/semmle/code/cpp/Declaration.qll

@@ -62,7 +62,7 @@ abstract class Declaration extends Locatable, @declaration {
     | c = this and
       result = c.getDeclaringEnum().getQualifiedName() + "::" + c.getName())
     or
-    exists (GlobalVariable v, string s1, string s2
+    exists (GlobalOrNamespaceVariable v, string s1, string s2
     | v = this and
       s2 = v.getNamespace().getQualifiedName() and
       s1 = v.getName()

cpp/ql/test/library-tests/namespaces/namespaces/decls.expected

@@ -5,7 +5,7 @@
 | file://:0:0:0:0 | (global namespace) | file://:0:0:0:0 | operator= | __va_list_tag::operator= |
 | file://:0:0:0:0 | (global namespace) | file://:0:0:0:0 | overflow_arg_area | __va_list_tag::overflow_arg_area |
 | file://:0:0:0:0 | (global namespace) | file://:0:0:0:0 | reg_save_area | __va_list_tag::reg_save_area |
-| file://:0:0:0:0 | B | namespaces.cpp:32:7:32:7 | x | <none> |
+| file://:0:0:0:0 | B | namespaces.cpp:32:7:32:7 | x | B::x |
 | namespaces.cpp:11:13:11:13 | C::D | file://:0:0:0:0 | p#0 | <none> |
 | namespaces.cpp:11:13:11:13 | C::D | file://:0:0:0:0 | p#0 | <none> |
 | namespaces.cpp:11:13:11:13 | C::D | namespaces.cpp:13:17:13:17 | f | C::D::f |