Undo renaming of getConstCharTPointer

Author: mbaluda

cpp/common/src/codingstandards/cpp/Dereferenced.qll

@@ -46,7 +46,7 @@ class BasicStringMemberFunctionDereferencedExpr extends BasicStringDereferencedE
       // basic_string::basic_string(const charT *, const Allocator &)
       f instanceof Constructor and
       f.getNumberOfParameters() <= 2 and
-      f.getParameter(0).getType() = stringType.getValueType() and
+      f.getParameter(0).getType() = stringType.getConstCharTPointer() and
       (
         f.getNumberOfParameters() = 2
         implies
@@ -58,14 +58,14 @@ class BasicStringMemberFunctionDereferencedExpr extends BasicStringDereferencedE
       // basic_string &basic_string::assign(const charT *)
       f.hasName(["append", "assign"]) and
       f.getNumberOfParameters() = 1 and
-      f.getParameter(0).getType() = stringType.getValueType() and
+      f.getParameter(0).getType() = stringType.getConstCharTPointer() and
       this = fc.getArgument(0)
       or
       // basic_string &basic_string::insert(size_type, const charT *)
       f.hasName("insert") and
       f.getNumberOfParameters() = 2 and
       f.getParameter(0).getType() = stringType.getSizeType() and
-      f.getParameter(1).getType() = stringType.getValueType() and
+      f.getParameter(1).getType() = stringType.getConstCharTPointer() and
       this = fc.getArgument(1)
       or
       // basic_string &basic_string::replace(size_type, size_type, const charT *)
@@ -74,7 +74,7 @@ class BasicStringMemberFunctionDereferencedExpr extends BasicStringDereferencedE
       f.getNumberOfParameters() = 3 and
       f.getParameter(0).getType() = [stringType.getSizeType(), stringType.getConstIteratorType()] and
       f.getParameter(1).getType() = [stringType.getSizeType(), stringType.getConstIteratorType()] and
-      f.getParameter(2).getType() = stringType.getValueType() and
+      f.getParameter(2).getType() = stringType.getConstCharTPointer() and
       this = fc.getArgument(2)
       or
       // size_type basic_string::find(const charT *, size_type)
@@ -87,7 +87,7 @@ class BasicStringMemberFunctionDereferencedExpr extends BasicStringDereferencedE
           "find", "rfind", "find_first_of", "find_last_of", "find_first_not_of", "find_last_not_of"
         ]) and
       f.getNumberOfParameters() = 2 and
-      f.getParameter(0).getType() = stringType.getValueType() and
+      f.getParameter(0).getType() = stringType.getConstCharTPointer() and
       f.getParameter(1).getType() = stringType.getSizeType() and
       this = fc.getArgument(0)
       or
@@ -96,15 +96,15 @@ class BasicStringMemberFunctionDereferencedExpr extends BasicStringDereferencedE
       // basic_string &basic_string::operator+=(const charT *)
       f.hasName(["compare", "operator=", "operator+="]) and
       f.getNumberOfParameters() = 1 and
-      f.getParameter(0).getType() = stringType.getValueType() and
+      f.getParameter(0).getType() = stringType.getConstCharTPointer() and
       this = fc.getArgument(0)
       or
       // int basic_string::compare(size_type, size_type, const charT *)
       f.hasName("compare") and
       f.getNumberOfParameters() = 3 and
       f.getParameter(0).getType() = stringType.getSizeType() and
       f.getParameter(1).getType() = stringType.getSizeType() and
-      f.getParameter(2).getType() = stringType.getValueType() and
+      f.getParameter(2).getType() = stringType.getConstCharTPointer() and
       this = fc.getArgument(2)
     )
   }
@@ -136,7 +136,7 @@ class BasicStringNonMemberFunctionDereferencedExpr extends BasicStringDereferenc
         ]) and
       f.getAParameter().getType().(ReferenceType).getBaseType().getUnspecifiedType() = stringType and
       exists(int param |
-        f.getParameter(param).getType() = stringType.getValueType() and
+        f.getParameter(param).getType() = stringType.getConstCharTPointer() and
         this = fc.getArgument(param)
       )
     )

cpp/common/src/codingstandards/cpp/rules/containeraccesswithoutrangecheck/ContainerAccessWithoutRangeCheck.qll

@@ -159,7 +159,7 @@ class StringContainerConstructorCall extends ContainerConstructorCall {
   override Expr getInitialContainerSizeExpr() {
     // from buffer
     c.getNumberOfParameters() = 3 and
-    c.getParameter(0).getType() = stringInstantiation.getValueType() and
+    c.getParameter(0).getType() = stringInstantiation.getConstCharTPointer() and
     c.getParameter(1).getType() = stringInstantiation.getSizeType() and
     c.getParameter(2).getType() = stringInstantiation.getConstAllocatorReferenceType() and
     // copies `n` items from the buffer
@@ -181,11 +181,11 @@ class StringContainerConstructorCall extends ContainerConstructorCall {
     or
     // from c-string constructors
     c.getNumberOfParameters() = 1 and
-    c.getParameter(0).getType() = stringInstantiation.getValueType() and
+    c.getParameter(0).getType() = stringInstantiation.getConstCharTPointer() and
     result = getArgument(0).getValue().length()
     or
     c.getNumberOfParameters() = 2 and
-    c.getParameter(0).getType() = stringInstantiation.getValueType() and
+    c.getParameter(0).getType() = stringInstantiation.getConstCharTPointer() and
     c.getParameter(1).getType() = stringInstantiation.getSizeType() and
     result = getArgument(1).getValue().toFloat()
     or
@@ -195,7 +195,7 @@ class StringContainerConstructorCall extends ContainerConstructorCall {
     result = getArgument(0).getValue().toFloat()
     or
     c.getNumberOfParameters() = 2 and
-    c.getParameter(0).getType() = stringInstantiation.getValueType() and
+    c.getParameter(0).getType() = stringInstantiation.getConstCharTPointer() and
     c.getParameter(1).getType() = stringInstantiation.getConstAllocatorReferenceType() and
     result = getArgument(0).getValue().length()
     or

cpp/common/src/codingstandards/cpp/standardlibrary/String.qll

@@ -13,7 +13,7 @@ class StdBasicString extends ClassTemplateInstantiation {
   Type getAllocator() { result = getTemplateArgument(2) }
 
   /** Gets the `const charT*` type for this `basic_string` instantiation. */
-  PointerType getValueType() {
+  PointerType getConstCharTPointer() {
     exists(SpecifiedType specType |
       specType = result.getBaseType() and
       specType.isConst() and