Fix A2-10-4 and A2-10-5 test results

Author: jketema

cpp/common/src/codingstandards/cpp/Config.qll

@@ -8,20 +8,20 @@ import codingstandards.cpp.exclusions.RuleMetadata
 import codingstandards.cpp.deviations.Deviations
 
 /** A `coding-standards.xml` configuration file (usually generated from an YAML configuration file). */
-class CodingStandardsFile extends XMLFile {
+class CodingStandardsFile extends XmlFile {
   CodingStandardsFile() {
     this.getBaseName() = "coding-standards.xml" and
     // Must be within the users source code.
     exists(this.getRelativePath())
   }
 }
 
-class CodingStandardsConfigSection extends XMLElement {
+class CodingStandardsConfigSection extends XmlElement {
   CodingStandardsConfigSection() { getParent() instanceof CodingStandardsConfig }
 }
 
 /** A "Coding Standards" configuration file */
-class CodingStandardsConfig extends XMLElement {
+class CodingStandardsConfig extends XmlElement {
   CodingStandardsConfig() {
     any(CodingStandardsFile csf).getARootElement() = this and
     this.getName() = "codingstandards"

cpp/common/src/codingstandards/cpp/deviations/Deviations.qll

@@ -17,7 +17,7 @@
  }
 
  /** An element which tells the analysis whether to report deviated results. */
- class CodingStandardsReportDeviatedAlerts extends XMLElement {
+ class CodingStandardsReportDeviatedAlerts extends XmlElement {
    CodingStandardsReportDeviatedAlerts() {
      getParent() instanceof CodingStandardsConfig and
      hasName("report-deviated-alerts")
@@ -35,7 +35,7 @@
  }
 
  /** A deviation permit record, that is specified by a permit identifier */
- class DeviationPermit extends XMLElement {
+ class DeviationPermit extends XmlElement {
    DeviationPermit() {
      getParent() instanceof DeviationPermits and
      hasName("deviation-permits-entry")
@@ -118,7 +118,7 @@
  }
 
  /** A deviation record, that is a specified rule or query */
- class DeviationRecord extends XMLElement {
+ class DeviationRecord extends XmlElement {
    DeviationRecord() {
      getParent() instanceof DeviationRecords and
      hasName("deviations-entry")
@@ -134,13 +134,13 @@
 
    private string getRawPermitId() { result = getAChild("permit-id").getTextValue() }
 
-   private XMLElement getRawRaisedBy() { result = getAChild("raised-by") }
+   private XmlElement getRawRaisedBy() { result = getAChild("raised-by") }
 
    private string getRawRaisedByName() { result = getRawRaisedBy().getAChild("name").getTextValue() }
 
    private string getRawRaisedByDate() { result = getRawRaisedBy().getAChild("date").getTextValue() }
 
-   private XMLElement getRawApprovedBy() { result = getAChild("approved-by") }
+   private XmlElement getRawApprovedBy() { result = getAChild("approved-by") }
 
    private string getRawApprovedByName() {
      result = getRawApprovedBy().getAChild("name").getTextValue()

cpp/common/src/codingstandards/cpp/guideline_recategorizations/GuidelineRecategorizations.qll

@@ -12,7 +12,7 @@ class GuidelineRecategorizations extends CodingStandardsConfigSection {
   GuidelineRecategorizations() { hasName("guideline-recategorizations") }
 }
 
-class GuidelineRecategorization extends XMLElement {
+class GuidelineRecategorization extends XmlElement {
   GuidelineRecategorization() {
     getParent() instanceof GuidelineRecategorizations and
     hasName("guideline-recategorizations-entry")