C++: Fix imports and module names in old dataflow/taint tracking library

cpp/ql/lib/semmle/code/cpp/dataflow/old/DataFlow2.qll

@@ -6,7 +6,7 @@
  * `DataFlow2::Configuration`, a `DataFlow3::Configuration`, or a
  * `DataFlow4::Configuration`.
  *
- * See `semmle.code.cpp.ir.dataflow.DataFlow` for the full documentation.
+ * See `semmle.code.cpp.dataflow.old.DataFlow` for the full documentation.
  */
 
 import cpp
@@ -15,6 +15,6 @@ import cpp
  * Provides classes for performing local (intra-procedural) and
  * global (inter-procedural) data flow analyses.
  */
-module DataFlow {
+module DataFlow2 {
   import semmle.code.cpp.dataflow.old.internal.DataFlowImpl2
 }

cpp/ql/lib/semmle/code/cpp/dataflow/old/DataFlow3.qll

@@ -6,7 +6,7 @@
  * `DataFlow2::Configuration`, a `DataFlow3::Configuration`, or a
  * `DataFlow4::Configuration`.
  *
- * See `semmle.code.cpp.ir.dataflow.DataFlow` for the full documentation.
+ * See `semmle.code.cpp.dataflow.old.DataFlow` for the full documentation.
  */
 
 import cpp
@@ -15,6 +15,6 @@ import cpp
  * Provides classes for performing local (intra-procedural) and
  * global (inter-procedural) data flow analyses.
  */
-module DataFlow {
+module DataFlow3 {
   import semmle.code.cpp.dataflow.old.internal.DataFlowImpl3
 }

cpp/ql/lib/semmle/code/cpp/dataflow/old/DataFlow4.qll

@@ -6,7 +6,7 @@
  * `DataFlow2::Configuration`, a `DataFlow3::Configuration`, or a
  * `DataFlow4::Configuration`.
  *
- * See `semmle.code.cpp.ir.dataflow.DataFlow` for the full documentation.
+ * See `semmle.code.cpp.dataflow.old.DataFlow` for the full documentation.
  */
 
 import cpp
@@ -15,6 +15,6 @@ import cpp
  * Provides classes for performing local (intra-procedural) and
  * global (inter-procedural) data flow analyses.
  */
-module DataFlow {
+module DataFlow4 {
   import semmle.code.cpp.dataflow.old.internal.DataFlowImpl4
 }

cpp/ql/lib/semmle/code/cpp/dataflow/old/TaintTracking.qll

@@ -15,4 +15,9 @@
  * `TaintTracking::localTaintStep` with arguments of type `DataFlow::Node`.
  */
 
-import semmle.code.cpp.ir.dataflow.TaintTracking
+import semmle.code.cpp.dataflow.old.DataFlow
+import semmle.code.cpp.dataflow.old.DataFlow2
+
+module TaintTracking {
+  import semmle.code.cpp.dataflow.old.internal.tainttracking1.TaintTrackingImpl
+}

cpp/ql/lib/semmle/code/cpp/dataflow/old/TaintTracking2.qll

@@ -8,7 +8,9 @@
  * `TaintTracking::Configuration` class extends `DataFlow::Configuration`, and
  * `TaintTracking2::Configuration` extends `DataFlow2::Configuration`.
  *
- * See `semmle.code.cpp.ir.dataflow.TaintTracking` for the full documentation.
+ * See `semmle.code.cpp.dataflow.old.TaintTracking` for the full documentation.
  */
 
-import semmle.code.cpp.ir.dataflow.TaintTracking2
+module TaintTracking2 {
+    import semmle.code.cpp.dataflow.old.internal.tainttracking2.TaintTrackingImpl
+}

cpp/ql/lib/semmle/code/cpp/dataflow/old/TaintTracking3.qll

@@ -1,14 +0,0 @@
-/**
- * Provides a `TaintTracking3` module, which is a copy of the `TaintTracking`
- * module. Use this class when data-flow configurations or taint-tracking
- * configurations must depend on each other. Two classes extending
- * `DataFlow::Configuration` should never depend on each other, but one of them
- * should instead depend on a `DataFlow2::Configuration`, a
- * `DataFlow3::Configuration`, or a `DataFlow4::Configuration`. The
- * `TaintTracking::Configuration` class extends `DataFlow::Configuration`, and
- * `TaintTracking2::Configuration` extends `DataFlow2::Configuration`.
- *
- * See `semmle.code.cpp.ir.dataflow.TaintTracking` for the full documentation.
- */
-
-import semmle.code.cpp.ir.dataflow.TaintTracking3

cpp/ql/test/library-tests/dataflow/fields/ASTConfiguration.qll

@@ -1,4 +1,4 @@
-private import semmle.code.cpp.dataflow.old.DataFlow2
+private import semmle.code.cpp.dataflow.old.DataFlow
 private import DataFlow
 
 class AstConf extends Configuration {

cpp/ql/test/library-tests/dataflow/fields/path-flow.ql

@@ -2,7 +2,7 @@
  * @kind path-problem
  */
 
-import semmle.code.cpp.dataflow.old.DataFlow2
+import semmle.code.cpp.dataflow.old.DataFlow
 import ASTConfiguration
 import DataFlow::PathGraph