C++: Fix override errors in MagicDraw.qll

Dave Bartolomeo · Dave Bartolomeo · commit fb67d3eae43a · 2019-11-21T13:18:45.000-07:00
diff --git a/cpp/ql/src/semmle/uml/MagicDraw.qll b/cpp/ql/src/semmle/uml/MagicDraw.qll
@@ -112,7 +112,7 @@ class UMLType extends UMLElement {
     else result = this.getUMLName()
   }
 
-  string toString() { result = this.getUMLName() }
+  override string toString() { result = this.getUMLName() }
 }
 
 /**
@@ -163,7 +163,7 @@ class UMLProperty extends UMLElement {
     result.getDeclaringType() = this.getUMLType().getCType()
   }
 
-  string toString() {
+  override string toString() {
     if this.isEnumConstant()
     then result = "- <<enum constant>> " + this.getUMLName()
     else result = "- " + this.getUMLName()
@@ -196,7 +196,7 @@ class UMLOperation extends UMLElement {
     result.getDeclaringType() = this.getUMLType().getCType()
   }
 
-  string toString() { result = "+ " + this.getUMLName() }
+  override string toString() { result = "+ " + this.getUMLName() }
 }
 
 /**
@@ -221,7 +221,7 @@ class UMLAssociation extends UMLProperty {
   /**
    * Gets the C field corresponding to this property, if any.
    */
-  Field getCField() {
+  override Field getCField() {
     result.hasName(this.getLabel()) and
     result.getDeclaringType() = this.getSource().getCType()
   }
@@ -271,7 +271,7 @@ class UMLInheritance extends UMLElement {
     )
   }
 
-  string toString() {
+  override string toString() {
     result = this.getUMLClient().getUMLName() + " implements " + this.getUMLSupplier().getUMLName()
   }
 }
@@ -303,5 +303,5 @@ class UMLPackage extends UMLElement {
     else result = this.getUMLName()
   }
 
-  string toString() { result = this.getUMLQualifiedName() }
+  override string toString() { result = this.getUMLQualifiedName() }
 }

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ class UMLType extends UMLElement {`
`112`	`112`	`else result = this.getUMLName()`
`113`	`113`	`}`
`114`	`114`
`115`		`- string toString() { result = this.getUMLName() }`
	`115`	`+ override string toString() { result = this.getUMLName() }`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`/**`
`@@ -163,7 +163,7 @@ class UMLProperty extends UMLElement {`
`163`	`163`	`result.getDeclaringType() = this.getUMLType().getCType()`
`164`	`164`	`}`
`165`	`165`
`166`		`- string toString() {`
	`166`	`+ override string toString() {`
`167`	`167`	`if this.isEnumConstant()`
`168`	`168`	`then result = "- <<enum constant>> " + this.getUMLName()`
`169`	`169`	`else result = "- " + this.getUMLName()`
`@@ -196,7 +196,7 @@ class UMLOperation extends UMLElement {`
`196`	`196`	`result.getDeclaringType() = this.getUMLType().getCType()`
`197`	`197`	`}`
`198`	`198`
`199`		`- string toString() { result = "+ " + this.getUMLName() }`
	`199`	`+ override string toString() { result = "+ " + this.getUMLName() }`
`200`	`200`	`}`
`201`	`201`
`202`	`202`	`/**`
`@@ -221,7 +221,7 @@ class UMLAssociation extends UMLProperty {`
`221`	`221`	`/**`
`222`	`222`	`* Gets the C field corresponding to this property, if any.`
`223`	`223`	`*/`
`224`		`- Field getCField() {`
	`224`	`+ override Field getCField() {`
`225`	`225`	`result.hasName(this.getLabel()) and`
`226`	`226`	`result.getDeclaringType() = this.getSource().getCType()`
`227`	`227`	`}`
`@@ -271,7 +271,7 @@ class UMLInheritance extends UMLElement {`
`271`	`271`	`)`
`272`	`272`	`}`
`273`	`273`
`274`		`- string toString() {`
	`274`	`+ override string toString() {`
`275`	`275`	`result = this.getUMLClient().getUMLName() + " implements " + this.getUMLSupplier().getUMLName()`
`276`	`276`	`}`
`277`	`277`	`}`
`@@ -303,5 +303,5 @@ class UMLPackage extends UMLElement {`
`303`	`303`	`else result = this.getUMLName()`
`304`	`304`	`}`
`305`	`305`
`306`		`- string toString() { result = this.getUMLQualifiedName() }`
	`306`	`+ override string toString() { result = this.getUMLQualifiedName() }`
`307`	`307`	`}`