diff options
author | Sam Thursfield <sam@afuera.me.uk> | 2020-06-24 18:45:51 +0000 |
---|---|---|
committer | Sam Thursfield <sam@afuera.me.uk> | 2020-06-24 18:45:51 +0000 |
commit | 1a23b2738035e7b6e73b1256e4fe45070d397e60 (patch) | |
tree | a78dee493b6705dd16e3751fe172c6508a8c897a | |
parent | 2a5bfa086ad211c42c25ae97b1b2beccf373e9ca (diff) | |
parent | f1e87c9e7c0954bdeeb76eb6fdb1fcd259f9a882 (diff) | |
download | tracker-1a23b2738035e7b6e73b1256e4fe45070d397e60.tar.gz |
Merge branch 'wip/carlosg/sparql-header-deps' into 'master'
Sanitize usage of libtracker-sparql/tracker-sparql.h includes
See merge request GNOME/tracker!281
-rw-r--r-- | src/libtracker-data/tracker-data-manager.h | 2 | ||||
-rw-r--r-- | src/libtracker-data/tracker-data-update.c | 1 | ||||
-rw-r--r-- | src/libtracker-data/tracker-data-update.h | 1 | ||||
-rw-r--r-- | src/libtracker-data/tracker-db-interface-sqlite.c | 2 | ||||
-rw-r--r-- | src/libtracker-data/tracker-db-interface.h | 2 | ||||
-rw-r--r-- | src/libtracker-data/tracker-ontologies.c | 2 | ||||
-rw-r--r-- | src/libtracker-data/tracker-property.c | 2 | ||||
-rw-r--r-- | src/libtracker-data/tracker-sparql-parser.c | 2 | ||||
-rw-r--r-- | src/libtracker-data/tracker-vtab-service.c | 2 |
9 files changed, 7 insertions, 9 deletions
diff --git a/src/libtracker-data/tracker-data-manager.h b/src/libtracker-data/tracker-data-manager.h index cc0afc2e8..cdcb81a32 100644 --- a/src/libtracker-data/tracker-data-manager.h +++ b/src/libtracker-data/tracker-data-manager.h @@ -35,7 +35,7 @@ typedef struct _TrackerDataManager TrackerDataManager; typedef struct _TrackerDataManagerClass TrackerDataManagerClass; #include <libtracker-common/tracker-common.h> -#include <libtracker-sparql/tracker-sparql.h> +#include <libtracker-sparql/tracker-ontologies.h> #include <libtracker-data/tracker-data-update.h> #include <libtracker-data/tracker-db-interface.h> diff --git a/src/libtracker-data/tracker-data-update.c b/src/libtracker-data/tracker-data-update.c index 873ac6b76..abc51860a 100644 --- a/src/libtracker-data/tracker-data-update.c +++ b/src/libtracker-data/tracker-data-update.c @@ -26,7 +26,6 @@ #include <time.h> #include <libtracker-common/tracker-common.h> -#include <libtracker-sparql/tracker-sparql.h> #include "tracker-class.h" #include "tracker-data-manager.h" diff --git a/src/libtracker-data/tracker-data-update.h b/src/libtracker-data/tracker-data-update.h index 17c315fe5..00588fa00 100644 --- a/src/libtracker-data/tracker-data-update.h +++ b/src/libtracker-data/tracker-data-update.h @@ -33,7 +33,6 @@ G_BEGIN_DECLS typedef struct _TrackerData TrackerData; typedef struct _TrackerDataClass TrackerDataClass; -#include <libtracker-sparql/tracker-sparql.h> #include "tracker-db-interface.h" #include "tracker-data-manager.h" diff --git a/src/libtracker-data/tracker-db-interface-sqlite.c b/src/libtracker-data/tracker-db-interface-sqlite.c index fe443b7a1..20ad51610 100644 --- a/src/libtracker-data/tracker-db-interface-sqlite.c +++ b/src/libtracker-data/tracker-db-interface-sqlite.c @@ -31,7 +31,7 @@ #include <libtracker-common/tracker-locale.h> #include <libtracker-common/tracker-parser.h> -#include <libtracker-sparql/tracker-sparql.h> +#include <libtracker-sparql/tracker-cursor.h> #include <libtracker-sparql/tracker-private.h> #include <libtracker-fts/tracker-fts.h> diff --git a/src/libtracker-data/tracker-db-interface.h b/src/libtracker-data/tracker-db-interface.h index 26d194e8e..3483467f7 100644 --- a/src/libtracker-data/tracker-db-interface.h +++ b/src/libtracker-data/tracker-db-interface.h @@ -23,7 +23,7 @@ #include <glib-object.h> #include <gio/gio.h> -#include <libtracker-sparql/tracker-sparql.h> +#include <libtracker-sparql/tracker-cursor.h> #include "tracker-property.h" diff --git a/src/libtracker-data/tracker-ontologies.c b/src/libtracker-data/tracker-ontologies.c index 7a8a6589f..eaef8bc1e 100644 --- a/src/libtracker-data/tracker-ontologies.c +++ b/src/libtracker-data/tracker-ontologies.c @@ -28,7 +28,7 @@ #include <gvdb/gvdb-builder.h> #include <gvdb/gvdb-reader.h> -#include <libtracker-sparql/tracker-sparql.h> +#include <libtracker-sparql/tracker-ontologies.h> #include "tracker-ontologies.h" diff --git a/src/libtracker-data/tracker-property.c b/src/libtracker-data/tracker-property.c index 11ff213d1..b6f21c0fb 100644 --- a/src/libtracker-data/tracker-property.c +++ b/src/libtracker-data/tracker-property.c @@ -24,7 +24,7 @@ #include <glib.h> -#include <libtracker-sparql/tracker-sparql.h> +#include <libtracker-sparql/tracker-ontologies.h> #include "tracker-namespace.h" #include "tracker-ontologies.h" diff --git a/src/libtracker-data/tracker-sparql-parser.c b/src/libtracker-data/tracker-sparql-parser.c index 83c04734a..f0f275e03 100644 --- a/src/libtracker-data/tracker-sparql-parser.c +++ b/src/libtracker-data/tracker-sparql-parser.c @@ -22,7 +22,7 @@ #include "tracker-sparql-parser.h" #include "tracker-sparql-grammar.h" -#include <libtracker-sparql/tracker-sparql.h> +#include <libtracker-sparql/tracker-connection.h> #include <string.h> typedef struct _TrackerRuleState TrackerRuleState; diff --git a/src/libtracker-data/tracker-vtab-service.c b/src/libtracker-data/tracker-vtab-service.c index 51a257384..c3636fd42 100644 --- a/src/libtracker-data/tracker-vtab-service.c +++ b/src/libtracker-data/tracker-vtab-service.c @@ -22,7 +22,7 @@ #include "libtracker-common/tracker-utils.h" #include "tracker-vtab-service.h" -#include <libtracker-sparql/tracker-sparql.h> +#include <libtracker-sparql/tracker-connection.h> #define N_VARIABLES 100 #define N_PARAMETERS 50 |