[tracker/wip/carlosg/shuffle-dirs: 10/15] libtracker-sparql: Move libtracker-data to libtracker-sparql/core

From: Carlos Garnacho <carlosg src gnome org>
To: commits-list gnome org
Cc:
Subject: [tracker/wip/carlosg/shuffle-dirs: 10/15] libtracker-sparql: Move libtracker-data to libtracker-sparql/core
Date: Sun, 3 Apr 2022 17:49:58 +0000 (UTC)

commit 96db2697c218e2038566f7f5ff9e073eb2a19e08
Author: Carlos Garnacho <carlosg gnome org>
Date:   Sun Apr 3 14:01:03 2022 +0200

    libtracker-sparql: Move libtracker-data to libtracker-sparql/core
    
    We want to stop making this a separate static library, but internal to
    libtracker-sparql. As a first step, move it into libtracker-sparql and
    use a cooler yet more honest name, this really is the core of our
    SPARQL and RDF storage implementation.

 src/{libtracker-data => libtracker-sparql/core}/.gitignore           | 0
 src/{libtracker-data => libtracker-sparql/core}/COPYING.LIB          | 0
 src/{libtracker-data => libtracker-sparql/core}/README.md            | 0
 src/{libtracker-data => libtracker-sparql/core}/libtracker-data.vapi | 0
 src/{libtracker-data => libtracker-sparql/core}/meson.build          | 0
 src/{libtracker-data => libtracker-sparql/core}/tracker-class.c      | 0
 src/{libtracker-data => libtracker-sparql/core}/tracker-class.h      | 0
 src/{libtracker-data => libtracker-sparql/core}/tracker-collation.c  | 0
 src/{libtracker-data => libtracker-sparql/core}/tracker-collation.h  | 0
 .../core}/tracker-data-enum-types.c.template                         | 0
 .../core}/tracker-data-enum-types.h.template                         | 0
 .../core}/tracker-data-manager.c                                     | 0
 .../core}/tracker-data-manager.h                                     | 0
 src/{libtracker-data => libtracker-sparql/core}/tracker-data-query.c | 0
 src/{libtracker-data => libtracker-sparql/core}/tracker-data-query.h | 0
 .../core}/tracker-data-update.c                                      | 0
 .../core}/tracker-data-update.h                                      | 0
 src/{libtracker-data => libtracker-sparql/core}/tracker-data.h       | 0
 .../core}/tracker-db-interface-sqlite.c                              | 0
 .../core}/tracker-db-interface-sqlite.h                              | 0
 .../core}/tracker-db-interface.c                                     | 0
 .../core}/tracker-db-interface.h                                     | 0
 src/{libtracker-data => libtracker-sparql/core}/tracker-db-manager.c | 0
 src/{libtracker-data => libtracker-sparql/core}/tracker-db-manager.h | 0
 .../core}/tracker-fts-tokenizer.c                                    | 0
 .../core}/tracker-fts-tokenizer.h                                    | 0
 src/{libtracker-data => libtracker-sparql/core}/tracker-fts.c        | 0
 src/{libtracker-data => libtracker-sparql/core}/tracker-fts.h        | 0
 src/{libtracker-data => libtracker-sparql/core}/tracker-namespace.c  | 0
 src/{libtracker-data => libtracker-sparql/core}/tracker-namespace.h  | 0
 src/{libtracker-data => libtracker-sparql/core}/tracker-ontologies.c | 0
 src/{libtracker-data => libtracker-sparql/core}/tracker-ontologies.h | 0
 src/{libtracker-data => libtracker-sparql/core}/tracker-ontology.c   | 0
 src/{libtracker-data => libtracker-sparql/core}/tracker-ontology.h   | 0
 src/{libtracker-data => libtracker-sparql/core}/tracker-property.c   | 0
 src/{libtracker-data => libtracker-sparql/core}/tracker-property.h   | 0
 src/{libtracker-data => libtracker-sparql/core}/tracker-rowid.c      | 0
 src/{libtracker-data => libtracker-sparql/core}/tracker-rowid.h      | 0
 .../core}/tracker-sparql-grammar.h                                   | 0
 .../core}/tracker-sparql-parser.c                                    | 0
 .../core}/tracker-sparql-parser.h                                    | 0
 .../core}/tracker-sparql-types.c                                     | 0
 .../core}/tracker-sparql-types.h                                     | 0
 src/{libtracker-data => libtracker-sparql/core}/tracker-sparql.c     | 0
 src/{libtracker-data => libtracker-sparql/core}/tracker-sparql.h     | 0
 .../core}/tracker-string-builder.c                                   | 0
 .../core}/tracker-string-builder.h                                   | 0
 .../core}/tracker-turtle-reader.c                                    | 0
 .../core}/tracker-turtle-reader.h                                    | 0
 src/{libtracker-data => libtracker-sparql/core}/tracker-uuid.c       | 0
 src/{libtracker-data => libtracker-sparql/core}/tracker-uuid.h       | 0
 .../core}/tracker-vtab-service.c                                     | 0
 .../core}/tracker-vtab-service.h                                     | 0
 .../core}/tracker-vtab-triples.c                                     | 0
 .../core}/tracker-vtab-triples.h                                     | 0
 src/libtracker-sparql/direct/tracker-direct-batch.c                  | 4 +---
 src/libtracker-sparql/direct/tracker-direct-statement.c              | 4 +++-
 src/libtracker-sparql/direct/tracker-direct.c                        | 5 ++---
 src/libtracker-sparql/direct/tracker-direct.h                        | 2 +-
 src/libtracker-sparql/meson.build                                    | 4 +++-
 src/libtracker-sparql/remote/tracker-remote-statement.c              | 4 ++--
 src/libtracker-sparql/tracker-error.c                                | 5 +++--
 src/libtracker-sparql/tracker-resource.c                             | 2 +-
 src/libtracker-sparql/tracker-utils.c                                | 2 +-
 src/meson.build                                                      | 2 --
 src/tracker/tracker-export.c                                         | 2 +-
 src/tracker/tracker-sql.c                                            | 2 +-
 67 files changed, 19 insertions(+), 19 deletions(-)
---
diff --git a/src/libtracker-data/.gitignore b/src/libtracker-sparql/core/.gitignore
similarity index 100%
rename from src/libtracker-data/.gitignore
rename to src/libtracker-sparql/core/.gitignore
diff --git a/src/libtracker-data/COPYING.LIB b/src/libtracker-sparql/core/COPYING.LIB
similarity index 100%
rename from src/libtracker-data/COPYING.LIB
rename to src/libtracker-sparql/core/COPYING.LIB
diff --git a/src/libtracker-data/README.md b/src/libtracker-sparql/core/README.md
similarity index 100%
rename from src/libtracker-data/README.md
rename to src/libtracker-sparql/core/README.md
diff --git a/src/libtracker-data/libtracker-data.vapi b/src/libtracker-sparql/core/libtracker-data.vapi
similarity index 100%
rename from src/libtracker-data/libtracker-data.vapi
rename to src/libtracker-sparql/core/libtracker-data.vapi
diff --git a/src/libtracker-data/meson.build b/src/libtracker-sparql/core/meson.build
similarity index 100%
rename from src/libtracker-data/meson.build
rename to src/libtracker-sparql/core/meson.build
diff --git a/src/libtracker-data/tracker-class.c b/src/libtracker-sparql/core/tracker-class.c
similarity index 100%
rename from src/libtracker-data/tracker-class.c
rename to src/libtracker-sparql/core/tracker-class.c
diff --git a/src/libtracker-data/tracker-class.h b/src/libtracker-sparql/core/tracker-class.h
similarity index 100%
rename from src/libtracker-data/tracker-class.h
rename to src/libtracker-sparql/core/tracker-class.h
diff --git a/src/libtracker-data/tracker-collation.c b/src/libtracker-sparql/core/tracker-collation.c
similarity index 100%
rename from src/libtracker-data/tracker-collation.c
rename to src/libtracker-sparql/core/tracker-collation.c
diff --git a/src/libtracker-data/tracker-collation.h b/src/libtracker-sparql/core/tracker-collation.h
similarity index 100%
rename from src/libtracker-data/tracker-collation.h
rename to src/libtracker-sparql/core/tracker-collation.h
diff --git a/src/libtracker-data/tracker-data-enum-types.c.template 
b/src/libtracker-sparql/core/tracker-data-enum-types.c.template
similarity index 100%
rename from src/libtracker-data/tracker-data-enum-types.c.template
rename to src/libtracker-sparql/core/tracker-data-enum-types.c.template
diff --git a/src/libtracker-data/tracker-data-enum-types.h.template 
b/src/libtracker-sparql/core/tracker-data-enum-types.h.template
similarity index 100%
rename from src/libtracker-data/tracker-data-enum-types.h.template
rename to src/libtracker-sparql/core/tracker-data-enum-types.h.template
diff --git a/src/libtracker-data/tracker-data-manager.c b/src/libtracker-sparql/core/tracker-data-manager.c
similarity index 100%
rename from src/libtracker-data/tracker-data-manager.c
rename to src/libtracker-sparql/core/tracker-data-manager.c
diff --git a/src/libtracker-data/tracker-data-manager.h b/src/libtracker-sparql/core/tracker-data-manager.h
similarity index 100%
rename from src/libtracker-data/tracker-data-manager.h
rename to src/libtracker-sparql/core/tracker-data-manager.h
diff --git a/src/libtracker-data/tracker-data-query.c b/src/libtracker-sparql/core/tracker-data-query.c
similarity index 100%
rename from src/libtracker-data/tracker-data-query.c
rename to src/libtracker-sparql/core/tracker-data-query.c
diff --git a/src/libtracker-data/tracker-data-query.h b/src/libtracker-sparql/core/tracker-data-query.h
similarity index 100%
rename from src/libtracker-data/tracker-data-query.h
rename to src/libtracker-sparql/core/tracker-data-query.h
diff --git a/src/libtracker-data/tracker-data-update.c b/src/libtracker-sparql/core/tracker-data-update.c
similarity index 100%
rename from src/libtracker-data/tracker-data-update.c
rename to src/libtracker-sparql/core/tracker-data-update.c
diff --git a/src/libtracker-data/tracker-data-update.h b/src/libtracker-sparql/core/tracker-data-update.h
similarity index 100%
rename from src/libtracker-data/tracker-data-update.h
rename to src/libtracker-sparql/core/tracker-data-update.h
diff --git a/src/libtracker-data/tracker-data.h b/src/libtracker-sparql/core/tracker-data.h
similarity index 100%
rename from src/libtracker-data/tracker-data.h
rename to src/libtracker-sparql/core/tracker-data.h
diff --git a/src/libtracker-data/tracker-db-interface-sqlite.c 
b/src/libtracker-sparql/core/tracker-db-interface-sqlite.c
similarity index 100%
rename from src/libtracker-data/tracker-db-interface-sqlite.c
rename to src/libtracker-sparql/core/tracker-db-interface-sqlite.c
diff --git a/src/libtracker-data/tracker-db-interface-sqlite.h 
b/src/libtracker-sparql/core/tracker-db-interface-sqlite.h
similarity index 100%
rename from src/libtracker-data/tracker-db-interface-sqlite.h
rename to src/libtracker-sparql/core/tracker-db-interface-sqlite.h
diff --git a/src/libtracker-data/tracker-db-interface.c b/src/libtracker-sparql/core/tracker-db-interface.c
similarity index 100%
rename from src/libtracker-data/tracker-db-interface.c
rename to src/libtracker-sparql/core/tracker-db-interface.c
diff --git a/src/libtracker-data/tracker-db-interface.h b/src/libtracker-sparql/core/tracker-db-interface.h
similarity index 100%
rename from src/libtracker-data/tracker-db-interface.h
rename to src/libtracker-sparql/core/tracker-db-interface.h
diff --git a/src/libtracker-data/tracker-db-manager.c b/src/libtracker-sparql/core/tracker-db-manager.c
similarity index 100%
rename from src/libtracker-data/tracker-db-manager.c
rename to src/libtracker-sparql/core/tracker-db-manager.c
diff --git a/src/libtracker-data/tracker-db-manager.h b/src/libtracker-sparql/core/tracker-db-manager.h
similarity index 100%
rename from src/libtracker-data/tracker-db-manager.h
rename to src/libtracker-sparql/core/tracker-db-manager.h
diff --git a/src/libtracker-data/tracker-fts-tokenizer.c b/src/libtracker-sparql/core/tracker-fts-tokenizer.c
similarity index 100%
rename from src/libtracker-data/tracker-fts-tokenizer.c
rename to src/libtracker-sparql/core/tracker-fts-tokenizer.c
diff --git a/src/libtracker-data/tracker-fts-tokenizer.h b/src/libtracker-sparql/core/tracker-fts-tokenizer.h
similarity index 100%
rename from src/libtracker-data/tracker-fts-tokenizer.h
rename to src/libtracker-sparql/core/tracker-fts-tokenizer.h
diff --git a/src/libtracker-data/tracker-fts.c b/src/libtracker-sparql/core/tracker-fts.c
similarity index 100%
rename from src/libtracker-data/tracker-fts.c
rename to src/libtracker-sparql/core/tracker-fts.c
diff --git a/src/libtracker-data/tracker-fts.h b/src/libtracker-sparql/core/tracker-fts.h
similarity index 100%
rename from src/libtracker-data/tracker-fts.h
rename to src/libtracker-sparql/core/tracker-fts.h
diff --git a/src/libtracker-data/tracker-namespace.c b/src/libtracker-sparql/core/tracker-namespace.c
similarity index 100%
rename from src/libtracker-data/tracker-namespace.c
rename to src/libtracker-sparql/core/tracker-namespace.c
diff --git a/src/libtracker-data/tracker-namespace.h b/src/libtracker-sparql/core/tracker-namespace.h
similarity index 100%
rename from src/libtracker-data/tracker-namespace.h
rename to src/libtracker-sparql/core/tracker-namespace.h
diff --git a/src/libtracker-data/tracker-ontologies.c b/src/libtracker-sparql/core/tracker-ontologies.c
similarity index 100%
rename from src/libtracker-data/tracker-ontologies.c
rename to src/libtracker-sparql/core/tracker-ontologies.c
diff --git a/src/libtracker-data/tracker-ontologies.h b/src/libtracker-sparql/core/tracker-ontologies.h
similarity index 100%
rename from src/libtracker-data/tracker-ontologies.h
rename to src/libtracker-sparql/core/tracker-ontologies.h
diff --git a/src/libtracker-data/tracker-ontology.c b/src/libtracker-sparql/core/tracker-ontology.c
similarity index 100%
rename from src/libtracker-data/tracker-ontology.c
rename to src/libtracker-sparql/core/tracker-ontology.c
diff --git a/src/libtracker-data/tracker-ontology.h b/src/libtracker-sparql/core/tracker-ontology.h
similarity index 100%
rename from src/libtracker-data/tracker-ontology.h
rename to src/libtracker-sparql/core/tracker-ontology.h
diff --git a/src/libtracker-data/tracker-property.c b/src/libtracker-sparql/core/tracker-property.c
similarity index 100%
rename from src/libtracker-data/tracker-property.c
rename to src/libtracker-sparql/core/tracker-property.c
diff --git a/src/libtracker-data/tracker-property.h b/src/libtracker-sparql/core/tracker-property.h
similarity index 100%
rename from src/libtracker-data/tracker-property.h
rename to src/libtracker-sparql/core/tracker-property.h
diff --git a/src/libtracker-data/tracker-rowid.c b/src/libtracker-sparql/core/tracker-rowid.c
similarity index 100%
rename from src/libtracker-data/tracker-rowid.c
rename to src/libtracker-sparql/core/tracker-rowid.c
diff --git a/src/libtracker-data/tracker-rowid.h b/src/libtracker-sparql/core/tracker-rowid.h
similarity index 100%
rename from src/libtracker-data/tracker-rowid.h
rename to src/libtracker-sparql/core/tracker-rowid.h
diff --git a/src/libtracker-data/tracker-sparql-grammar.h 
b/src/libtracker-sparql/core/tracker-sparql-grammar.h
similarity index 100%
rename from src/libtracker-data/tracker-sparql-grammar.h
rename to src/libtracker-sparql/core/tracker-sparql-grammar.h
diff --git a/src/libtracker-data/tracker-sparql-parser.c b/src/libtracker-sparql/core/tracker-sparql-parser.c
similarity index 100%
rename from src/libtracker-data/tracker-sparql-parser.c
rename to src/libtracker-sparql/core/tracker-sparql-parser.c
diff --git a/src/libtracker-data/tracker-sparql-parser.h b/src/libtracker-sparql/core/tracker-sparql-parser.h
similarity index 100%
rename from src/libtracker-data/tracker-sparql-parser.h
rename to src/libtracker-sparql/core/tracker-sparql-parser.h
diff --git a/src/libtracker-data/tracker-sparql-types.c b/src/libtracker-sparql/core/tracker-sparql-types.c
similarity index 100%
rename from src/libtracker-data/tracker-sparql-types.c
rename to src/libtracker-sparql/core/tracker-sparql-types.c
diff --git a/src/libtracker-data/tracker-sparql-types.h b/src/libtracker-sparql/core/tracker-sparql-types.h
similarity index 100%
rename from src/libtracker-data/tracker-sparql-types.h
rename to src/libtracker-sparql/core/tracker-sparql-types.h
diff --git a/src/libtracker-data/tracker-sparql.c b/src/libtracker-sparql/core/tracker-sparql.c
similarity index 100%
rename from src/libtracker-data/tracker-sparql.c
rename to src/libtracker-sparql/core/tracker-sparql.c
diff --git a/src/libtracker-data/tracker-sparql.h b/src/libtracker-sparql/core/tracker-sparql.h
similarity index 100%
rename from src/libtracker-data/tracker-sparql.h
rename to src/libtracker-sparql/core/tracker-sparql.h
diff --git a/src/libtracker-data/tracker-string-builder.c 
b/src/libtracker-sparql/core/tracker-string-builder.c
similarity index 100%
rename from src/libtracker-data/tracker-string-builder.c
rename to src/libtracker-sparql/core/tracker-string-builder.c
diff --git a/src/libtracker-data/tracker-string-builder.h 
b/src/libtracker-sparql/core/tracker-string-builder.h
similarity index 100%
rename from src/libtracker-data/tracker-string-builder.h
rename to src/libtracker-sparql/core/tracker-string-builder.h
diff --git a/src/libtracker-data/tracker-turtle-reader.c b/src/libtracker-sparql/core/tracker-turtle-reader.c
similarity index 100%
rename from src/libtracker-data/tracker-turtle-reader.c
rename to src/libtracker-sparql/core/tracker-turtle-reader.c
diff --git a/src/libtracker-data/tracker-turtle-reader.h b/src/libtracker-sparql/core/tracker-turtle-reader.h
similarity index 100%
rename from src/libtracker-data/tracker-turtle-reader.h
rename to src/libtracker-sparql/core/tracker-turtle-reader.h
diff --git a/src/libtracker-data/tracker-uuid.c b/src/libtracker-sparql/core/tracker-uuid.c
similarity index 100%
rename from src/libtracker-data/tracker-uuid.c
rename to src/libtracker-sparql/core/tracker-uuid.c
diff --git a/src/libtracker-data/tracker-uuid.h b/src/libtracker-sparql/core/tracker-uuid.h
similarity index 100%
rename from src/libtracker-data/tracker-uuid.h
rename to src/libtracker-sparql/core/tracker-uuid.h
diff --git a/src/libtracker-data/tracker-vtab-service.c b/src/libtracker-sparql/core/tracker-vtab-service.c
similarity index 100%
rename from src/libtracker-data/tracker-vtab-service.c
rename to src/libtracker-sparql/core/tracker-vtab-service.c
diff --git a/src/libtracker-data/tracker-vtab-service.h b/src/libtracker-sparql/core/tracker-vtab-service.h
similarity index 100%
rename from src/libtracker-data/tracker-vtab-service.h
rename to src/libtracker-sparql/core/tracker-vtab-service.h
diff --git a/src/libtracker-data/tracker-vtab-triples.c b/src/libtracker-sparql/core/tracker-vtab-triples.c
similarity index 100%
rename from src/libtracker-data/tracker-vtab-triples.c
rename to src/libtracker-sparql/core/tracker-vtab-triples.c
diff --git a/src/libtracker-data/tracker-vtab-triples.h b/src/libtracker-sparql/core/tracker-vtab-triples.h
similarity index 100%
rename from src/libtracker-data/tracker-vtab-triples.h
rename to src/libtracker-sparql/core/tracker-vtab-triples.h
diff --git a/src/libtracker-sparql/direct/tracker-direct-batch.c 
b/src/libtracker-sparql/direct/tracker-direct-batch.c
index fa3cf324a..ed0d0cdb6 100644
--- a/src/libtracker-sparql/direct/tracker-direct-batch.c
+++ b/src/libtracker-sparql/direct/tracker-direct-batch.c
@@ -21,12 +21,10 @@
 
 #include "config.h"
 
-#include <libtracker-data/tracker-data-update.h>
-#include <libtracker-data/tracker-sparql.h>
+#include <libtracker-sparql/core/tracker-data.h>
 
 #include "tracker-direct-batch.h"
 #include "tracker-direct.h"
-#include "tracker-data.h"
 #include "tracker-private.h"
 
 typedef struct _TrackerDirectBatchPrivate TrackerDirectBatchPrivate;
diff --git a/src/libtracker-sparql/direct/tracker-direct-statement.c 
b/src/libtracker-sparql/direct/tracker-direct-statement.c
index 86f58213b..f23901213 100644
--- a/src/libtracker-sparql/direct/tracker-direct-statement.c
+++ b/src/libtracker-sparql/direct/tracker-direct-statement.c
@@ -18,9 +18,11 @@
  */
 
 #include "config.h"
+
 #include "tracker-direct-statement.h"
-#include "tracker-data.h"
 #include "tracker-private.h"
+
+#include <libtracker-sparql/core/tracker-data.h>
 #include <libtracker-sparql/tracker-serializer.h>
 
 typedef struct _TrackerDirectStatementPrivate TrackerDirectStatementPrivate;
diff --git a/src/libtracker-sparql/direct/tracker-direct.c b/src/libtracker-sparql/direct/tracker-direct.c
index 891f5f68a..20ae389ab 100644
--- a/src/libtracker-sparql/direct/tracker-direct.c
+++ b/src/libtracker-sparql/direct/tracker-direct.c
@@ -23,10 +23,9 @@
 #include "tracker-direct.h"
 #include "tracker-direct-batch.h"
 #include "tracker-direct-statement.h"
-#include "libtracker-sparql/tracker-private.h"
+
 #include <libtracker-common/tracker-utils.h>
-#include <libtracker-data/tracker-data.h>
-#include <libtracker-data/tracker-sparql.h>
+#include <libtracker-sparql/core/tracker-data.h>
 #include <libtracker-sparql/tracker-notifier-private.h>
 #include <libtracker-sparql/tracker-private.h>
 #include <libtracker-sparql/tracker-serializer.h>
diff --git a/src/libtracker-sparql/direct/tracker-direct.h b/src/libtracker-sparql/direct/tracker-direct.h
index d914f0fa1..b9d443c37 100644
--- a/src/libtracker-sparql/direct/tracker-direct.h
+++ b/src/libtracker-sparql/direct/tracker-direct.h
@@ -22,7 +22,7 @@
 #define __TRACKER_LOCAL_CONNECTION_H__
 
 #include <libtracker-sparql/tracker-sparql.h>
-#include <libtracker-data/tracker-data-manager.h>
+#include <libtracker-sparql/core/tracker-data.h>
 
 #include "tracker-direct-batch.h"
 
diff --git a/src/libtracker-sparql/meson.build b/src/libtracker-sparql/meson.build
index 629ba0c2e..c3dfab045 100644
--- a/src/libtracker-sparql/meson.build
+++ b/src/libtracker-sparql/meson.build
@@ -1,3 +1,5 @@
+subdir('core')
+
 version_header = configure_file(
     input: 'tracker-version-generated.h.meson.in',
     output: 'tracker-version-generated.h',
@@ -92,7 +94,7 @@ subdir('direct')
 
 libtracker_sparql = library('tracker-sparql-' + tracker_api_version,
     '../libtracker-common/libtracker-common.vapi',
-    '../libtracker-data/libtracker-data.vapi',
+    'core/libtracker-data.vapi',
     'direct/tracker-direct.vapi',
     'tracker-backend.vala',
     'tracker-remote-module.c',
diff --git a/src/libtracker-sparql/remote/tracker-remote-statement.c 
b/src/libtracker-sparql/remote/tracker-remote-statement.c
index beb94d2da..e2ff53786 100644
--- a/src/libtracker-sparql/remote/tracker-remote-statement.c
+++ b/src/libtracker-sparql/remote/tracker-remote-statement.c
@@ -24,8 +24,8 @@
 #include "tracker-remote-statement.h"
 
 #include <libtracker-common/tracker-common.h>
-#include <libtracker-data/tracker-sparql-grammar.h>
-#include <libtracker-data/tracker-sparql-parser.h>
+#include <libtracker-sparql/core/tracker-sparql-grammar.h>
+#include <libtracker-sparql/core/tracker-sparql-parser.h>
 #include <libtracker-sparql/tracker-private.h>
 
 struct _TrackerRemoteStatement
diff --git a/src/libtracker-sparql/tracker-error.c b/src/libtracker-sparql/tracker-error.c
index 8be2effc2..a26e955e3 100644
--- a/src/libtracker-sparql/tracker-error.c
+++ b/src/libtracker-sparql/tracker-error.c
@@ -19,7 +19,8 @@
  */
 
 #include "tracker-error.h"
-#include <libtracker-data/tracker-data.h>
+
+#include <libtracker-sparql/core/tracker-data.h>
 
 static const GDBusErrorEntry tracker_sparql_error_entries[] =
 {
@@ -57,7 +58,7 @@ tracker_sparql_error_quark (void)
        return (GQuark) quark_volatile;
 }
 
-/* Converts internal error codes from libtracker-data into public
+/* Converts internal error codes into public
  * TrackerSparqlError codes. */
 GError *
 _translate_internal_error (GError *error)
diff --git a/src/libtracker-sparql/tracker-resource.c b/src/libtracker-sparql/tracker-resource.c
index 69628a10a..de509fc78 100644
--- a/src/libtracker-sparql/tracker-resource.c
+++ b/src/libtracker-sparql/tracker-resource.c
@@ -35,7 +35,7 @@
 #include "tracker-utils.h"
 
 /* For prefixed names parsing */
-#include "libtracker-data/tracker-sparql-grammar.h"
+#include <libtracker-sparql/core/tracker-sparql-grammar.h>
 
 #include <tracker-private.h>
 
diff --git a/src/libtracker-sparql/tracker-utils.c b/src/libtracker-sparql/tracker-utils.c
index 18ef74428..063559793 100644
--- a/src/libtracker-sparql/tracker-utils.c
+++ b/src/libtracker-sparql/tracker-utils.c
@@ -30,7 +30,7 @@
 
 #include "tracker-utils.h"
 
-#include "libtracker-data/tracker-uuid.h"
+#include <libtracker-sparql/core/tracker-uuid.h>
 
 /**
  * tracker_sparql_escape_string:
diff --git a/src/meson.build b/src/meson.build
index 11a0ca8ed..e3d330c6c 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -4,9 +4,7 @@ subdir('libtracker-common')
 # Public ontologies
 subdir('ontologies')
 
-# Internal database library
 subdir('gvdb')
-subdir('libtracker-data')
 
 # Intermediate library of RDF & SPARQL helper functions.
 # This gets used internally and also becomes part of the
diff --git a/src/tracker/tracker-export.c b/src/tracker/tracker-export.c
index 9d9d42a83..c9da3644e 100644
--- a/src/tracker/tracker-export.c
+++ b/src/tracker/tracker-export.c
@@ -33,7 +33,7 @@
 
 #include <libtracker-sparql/tracker-sparql.h>
 #include <libtracker-common/tracker-common.h>
-#include <libtracker-data/tracker-data.h>
+#include <libtracker-sparql/core/tracker-data.h>
 
 static gchar *database_path;
 static gchar *dbus_service;
diff --git a/src/tracker/tracker-sql.c b/src/tracker/tracker-sql.c
index e02ba6fb2..eca6972b6 100644
--- a/src/tracker/tracker-sql.c
+++ b/src/tracker/tracker-sql.c
@@ -27,7 +27,7 @@
 #include <glib/gi18n.h>
 
 #include <libtracker-common/tracker-common.h>
-#include <libtracker-data/tracker-data.h>
+#include <libtracker-sparql/core/tracker-data.h>
 
 #include "tracker-sql.h"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]