[tracker/wip/carlosg/ttl-parser: 2/2] libtracker-data: Drop old parser code

[Carlos Garnacho <carlosg src gnome org>]

commit b73a08a03215514f6b1e0fe6e3e658fc306b065c
Author: Carlos Garnacho <carlosg gnome org>
Date:   Sun Mar 8 22:40:29 2020 +0100

    libtracker-data: Drop old parser code
    
    This is (at last!) no longer used anywhere.

 src/libtracker-data/meson.build                 |   27 +-
 src/libtracker-data/tracker-data-manager.c      |    1 -
 src/libtracker-data/tracker-data-update.c       |    1 -
 src/libtracker-data/tracker-data.h              |    1 -
 src/libtracker-data/tracker-sparql-parser.c     |    4 +-
 src/libtracker-data/tracker-sparql-scanner.vala | 1276 -----------------------
 src/libtracker-data/tracker-sparql.c            |    1 -
 src/libtracker-data/tracker-turtle-reader.vala  |  383 -------
 src/libtracker-data/tracker-vala-namespace.vala |   29 -
 9 files changed, 3 insertions(+), 1720 deletions(-)
---
diff --git a/src/libtracker-data/meson.build b/src/libtracker-data/meson.build
index 4c04f7a31..ad1d3d151 100644
--- a/src/libtracker-data/meson.build
+++ b/src/libtracker-data/meson.build
@@ -1,27 +1,3 @@
-# Vala parts of libtracker-data are split out separately, because we can't link
-# the Vala code to libicu. In the Makefile.am this library is called
-# libtracker-sparql-query.
-libtracker_data_vala = static_library('tracker-sparql-query',
-    'tracker-vala-namespace.vala',
-    'tracker-sparql-scanner.vala',
-    '../libtracker-common/libtracker-common.vapi',
-    'libtracker-data.vapi',
-    tracker_sparql_vapi,
-    tracker_common_enum_header,
-    c_args: tracker_c_args + [
-        '-include', 'libtracker-sparql/tracker-private.h',
-    ],
-    vala_args: [
-        '--debug',
-        '--pkg', 'posix',
-        # FIXME: Meson has code to add --target-glib automatically, but it
-        # doesn't seem to work here.
-        '--target-glib', glib_required,
-    ],
-    dependencies: [tracker_common_dep],
-    include_directories: [commoninc, configinc, srcinc],
-)
-
 tracker_data_enums = gnome.mkenums('tracker-data-enum-types',
     sources: 'tracker-db-interface-sqlite.h',
     c_template: 'tracker-data-enum-types.c.template',
@@ -66,7 +42,6 @@ libtracker_data = library('tracker-data',
     install_dir: tracker_internal_libs_dir,
     # This doesn't depend on tracker_common_dep because of
     # https://github.com/mesonbuild/meson/issues/671
-    link_with: [libtracker_data_vala],
     # We do *not* want --no-undefined here, this library uses
     # symbols from libtracker-sparql, but does not mean it should
     # be linked to it.
@@ -76,7 +51,7 @@ libtracker_data = library('tracker-data',
 )
 
 tracker_data_dep = declare_dependency(
-    link_with: [libtracker_data, libtracker_data_vala],
+    link_with: [libtracker_data],
     dependencies: tracker_data_dependencies,
     include_directories: include_directories('.'),
     sources: enums[1],
diff --git a/src/libtracker-data/tracker-data-manager.c b/src/libtracker-data/tracker-data-manager.c
index 109d94923..0e1bac987 100644
--- a/src/libtracker-data/tracker-data-manager.c
+++ b/src/libtracker-data/tracker-data-manager.c
@@ -43,7 +43,6 @@
 #include "tracker-ontologies.h"
 #include "tracker-ontology.h"
 #include "tracker-property.h"
-#include "tracker-sparql-query.h"
 #include "tracker-data-query.h"
 #include "tracker-sparql-parser.h"
 #include "tracker-turtle-reader.h"
diff --git a/src/libtracker-data/tracker-data-update.c b/src/libtracker-data/tracker-data-update.c
index 66a094dca..29fe09fdb 100644
--- a/src/libtracker-data/tracker-data-update.c
+++ b/src/libtracker-data/tracker-data-update.c
@@ -36,7 +36,6 @@
 #include "tracker-db-manager.h"
 #include "tracker-ontologies.h"
 #include "tracker-property.h"
-#include "tracker-sparql-query.h"
 #include "tracker-sparql.h"
 #include "tracker-turtle-reader.h"
 
diff --git a/src/libtracker-data/tracker-data.h b/src/libtracker-data/tracker-data.h
index 700546e91..8d61f02e4 100644
--- a/src/libtracker-data/tracker-data.h
+++ b/src/libtracker-data/tracker-data.h
@@ -37,7 +37,6 @@
 #include "tracker-ontology.h"
 #include "tracker-ontologies.h"
 #include "tracker-property.h"
-#include "tracker-sparql-query.h"
 #include "tracker-sparql.h"
 #include "tracker-uuid.h"
 
diff --git a/src/libtracker-data/tracker-sparql-parser.c b/src/libtracker-data/tracker-sparql-parser.c
index f065a00a1..c74858236 100644
--- a/src/libtracker-data/tracker-sparql-parser.c
+++ b/src/libtracker-data/tracker-sparql-parser.c
@@ -19,11 +19,11 @@
  */
 #include "config.h"
 
-#include "tracker-sparql-query.h"
 #include "tracker-sparql-parser.h"
 #include "tracker-sparql-grammar.h"
 
-#include "string.h"
+#include <libtracker-sparql/tracker-sparql.h>
+#include <string.h>
 
 typedef struct _TrackerRuleState TrackerRuleState;
 typedef struct _TrackerNodeTree TrackerNodeTree;
diff --git a/src/libtracker-data/tracker-sparql.c b/src/libtracker-data/tracker-sparql.c
index 314863169..2e4808ef9 100644
--- a/src/libtracker-data/tracker-sparql.c
+++ b/src/libtracker-data/tracker-sparql.c
@@ -29,7 +29,6 @@
 #include "tracker-sparql-grammar.h"
 #include "tracker-collation.h"
 #include "tracker-db-interface-sqlite.h"
-#include "tracker-sparql-query.h"
 #include "tracker-utils.h"
 
 #define TRACKER_NS "http://www.tracker-project.org/ontologies/tracker#";