From 0029a33ee6bf2cc36bdd44f4737ff5fd636ce919 Mon Sep 17 00:00:00 2001
From: Geoffrey White <40627776+geoffw0@users.noreply.github.com>
Date: Thu, 11 Jul 2019 19:08:10 +0100
Subject: [PATCH] CPP: Deprecate Interface and remove the test.

---
 cpp/ql/src/semmle/code/cpp/Class.qll                          | 3 ++-
 .../virtual_functions/virtual_functions/interfaces.expected   | 1 -
 .../virtual_functions/virtual_functions/interfaces.ql         | 4 ----
 3 files changed, 2 insertions(+), 6 deletions(-)
 delete mode 100644 cpp/ql/test/library-tests/virtual_functions/virtual_functions/interfaces.expected
 delete mode 100644 cpp/ql/test/library-tests/virtual_functions/virtual_functions/interfaces.ql

diff --git a/cpp/ql/src/semmle/code/cpp/Class.qll b/cpp/ql/src/semmle/code/cpp/Class.qll
index 37deee13146..0d166eb7047 100644
--- a/cpp/ql/src/semmle/code/cpp/Class.qll
+++ b/cpp/ql/src/semmle/code/cpp/Class.qll
@@ -1116,8 +1116,9 @@ class PartialClassTemplateSpecialization extends ClassTemplateSpecialization {
  * };
  * ```
  * 
+ * DEPRECATED: This class is considered to be too specific for general usage.
  */
-class Interface extends Class {
+deprecated class Interface extends Class {
   Interface() {
     forex(Declaration m | m.getDeclaringType() = this.getABaseClass*() and not compgenerated(unresolveElement(m)) | m instanceof PureVirtualFunction)
   }
diff --git a/cpp/ql/test/library-tests/virtual_functions/virtual_functions/interfaces.expected b/cpp/ql/test/library-tests/virtual_functions/virtual_functions/interfaces.expected
deleted file mode 100644
index 849b4255f03..00000000000
--- a/cpp/ql/test/library-tests/virtual_functions/virtual_functions/interfaces.expected
+++ /dev/null
@@ -1 +0,0 @@
-| virtual_functions.cpp:1:7:1:7 | A |
diff --git a/cpp/ql/test/library-tests/virtual_functions/virtual_functions/interfaces.ql b/cpp/ql/test/library-tests/virtual_functions/virtual_functions/interfaces.ql
deleted file mode 100644
index 211f3a33b2e..00000000000
--- a/cpp/ql/test/library-tests/virtual_functions/virtual_functions/interfaces.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-import cpp
-
-from Interface i
-select i