Merge pull request #3520 from dbartol/github/codeql-c-analysis-team/79

C++: Mark deprecated overrides as deprecated

Author: geoffw0

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

@@ -261,18 +261,6 @@ class File extends Container, @file {
   /** Holds if this file was compiled as C++ (at any point). */
   predicate compiledAsCpp() { fileannotations(underlyingElement(this), 1, "compiled as c++", "1") }
 
-  /**
-   * DEPRECATED: Objective-C is no longer supported.
-   * Holds if this file was compiled as Objective C (at any point).
-   */
-  deprecated predicate compiledAsObjC() { none() }
-
-  /**
-   * DEPRECATED: Objective-C is no longer supported.
-   * Holds if this file was compiled as Objective C++ (at any point).
-   */
-  deprecated predicate compiledAsObjCpp() { none() }
-
   /**
    * Holds if this file was compiled by a Microsoft compiler (at any point).
    *
@@ -316,14 +304,6 @@ class File extends Container, @file {
     exists(Include i | i.getFile() = this and i.getIncludedFile() = result)
   }
 
-  /**
-   * DEPRECATED: use `getParentContainer` instead.
-   * Gets the folder which contains this file.
-   */
-  deprecated Folder getParent() {
-    containerparent(unresolveElement(result), underlyingElement(this))
-  }
-
   /**
    * Holds if this file may be from source. This predicate holds for all files
    * except the dummy file, whose name is the empty string, which contains
@@ -341,28 +321,6 @@ class File extends Container, @file {
   /** Gets the metric file. */
   MetricFile getMetrics() { result = this }
 
-  /**
-   * DEPRECATED: Use `getAbsolutePath` instead.
-   * Gets the full name of this file, for example:
-   * "/usr/home/me/myprogram.c".
-   */
-  deprecated string getName() { files(underlyingElement(this), result, _, _, _) }
-
-  /**
-   * DEPRECATED: Use `getAbsolutePath` instead.
-   * Holds if this file has the specified full name.
-   *
-   * Example usage: `f.hasName("/usr/home/me/myprogram.c")`.
-   */
-  deprecated predicate hasName(string name) { name = this.getName() }
-
-  /**
-   * DEPRECATED: Use `getAbsolutePath` instead.
-   * Gets the full name of this file, for example
-   * "/usr/home/me/myprogram.c".
-   */
-  deprecated string getFullName() { result = this.getName() }
-
   /**
    * Gets the remainder of the base name after the first dot character. Note
    * that the name of this predicate is in plural form, unlike `getExtension`,
@@ -377,22 +335,6 @@ class File extends Container, @file {
    */
   string getExtensions() { files(underlyingElement(this), _, _, result, _) }
 
-  /**
-   * DEPRECATED: Use `getBaseName` instead.
-   * Gets the name and extension(s), but not path, of a file. For example,
-   * if the full name is "/path/to/filename.a.bcd" then the filename is
-   * "filename.a.bcd".
-   */
-  deprecated string getFileName() {
-    // [a/b.c/d/]fileName
-    //         ^ beginAfter
-    exists(string fullName, int beginAfter |
-      fullName = this.getName() and
-      beginAfter = max(int i | i = -1 or fullName.charAt(i) = "/" | i) and
-      result = fullName.suffix(beginAfter + 1)
-    )
-  }
-
   /**
    * Gets the short name of this file, that is, the prefix of its base name up
    * to (but not including) the first dot character if there is one, or the

cpp/ql/src/semmle/code/cpp/models/implementations/Printf.qll

@@ -19,7 +19,7 @@ class Printf extends FormattingFunction, AliasFunction {
 
   override int getFormatParameterIndex() { result = 0 }
 
-  override predicate isWideCharDefault() {
+  deprecated override predicate isWideCharDefault() {
     hasGlobalOrStdName("wprintf") or
     hasGlobalName("wprintf_s")
   }
@@ -47,7 +47,7 @@ class Fprintf extends FormattingFunction {
 
   override int getFormatParameterIndex() { result = 1 }
 
-  override predicate isWideCharDefault() { hasGlobalOrStdName("fwprintf") }
+  deprecated override predicate isWideCharDefault() { hasGlobalOrStdName("fwprintf") }
 
   override int getOutputParameterIndex() { result = 0 }
 }
@@ -70,7 +70,7 @@ class Sprintf extends FormattingFunction {
     not exists(getDefinition().getFile().getRelativePath())
   }
 
-  override predicate isWideCharDefault() {
+  deprecated override predicate isWideCharDefault() {
     getParameter(getFormatParameterIndex())
         .getType()
         .getUnspecifiedType()
@@ -136,7 +136,7 @@ class Snprintf extends FormattingFunction {
     else result = getFirstFormatArgumentIndex() - 1
   }
 
-  override predicate isWideCharDefault() {
+  deprecated override predicate isWideCharDefault() {
     getParameter(getFormatParameterIndex())
         .getType()
         .getUnspecifiedType()
@@ -201,7 +201,7 @@ class StringCchPrintf extends FormattingFunction {
     if getName().matches("%Ex") then result = 5 else result = 2
   }
 
-  override predicate isWideCharDefault() {
+  deprecated override predicate isWideCharDefault() {
     getParameter(getFormatParameterIndex())
         .getType()
         .getUnspecifiedType()