[tracker/wip/carlosg/tracker-3.0-api-breaks: 61/95] libtracker-sparql: Make class structs private

From: Carlos Garnacho <carlosg src gnome org>
To: commits-list gnome org
Cc:
Subject: [tracker/wip/carlosg/tracker-3.0-api-breaks: 61/95] libtracker-sparql: Make class structs private
Date: Fri, 14 Feb 2020 13:35:45 +0000 (UTC)
commit 0559b300326ee0a3767747abfd8c91a92679f4e0
Author: Carlos Garnacho <carlosg gnome org>
Date:   Wed Jan 8 22:30:03 2020 +0100

    libtracker-sparql: Make class structs private
    
    No object in the public API is meant to be subclassed, hide the
    class definitions so we have room to extend those at will in the
    future.

 src/libtracker-bus/meson.build                    |   4 +-
 src/libtracker-data/meson.build                   |   4 +-
 src/libtracker-data/tracker-db-interface-sqlite.c |   1 +
 src/libtracker-direct/meson.build                 |   4 +-
 src/libtracker-remote/meson.build                 |   3 +-
 src/libtracker-sparql-backend/meson.build         |   4 +
 src/libtracker-sparql/tracker-connection.c        |   1 +
 src/libtracker-sparql/tracker-connection.h        |  65 ---------
 src/libtracker-sparql/tracker-cursor.c            |   1 +
 src/libtracker-sparql/tracker-cursor.h            |  34 -----
 src/libtracker-sparql/tracker-endpoint-dbus.c     |   1 +
 src/libtracker-sparql/tracker-endpoint-dbus.h     |  12 +-
 src/libtracker-sparql/tracker-endpoint.c          |   1 +
 src/libtracker-sparql/tracker-endpoint.h          |   5 +-
 src/libtracker-sparql/tracker-notifier.c          |   1 +
 src/libtracker-sparql/tracker-notifier.h          |  10 --
 src/libtracker-sparql/tracker-private.h           | 163 ++++++++++++++++++++++
 src/libtracker-sparql/tracker-resource.c          |   2 +
 src/libtracker-sparql/tracker-resource.h          |   5 -
 src/libtracker-sparql/tracker-statement.c         |   1 +
 src/libtracker-sparql/tracker-statement.h         |  30 ----
 21 files changed, 198 insertions(+), 154 deletions(-)
---
diff --git a/src/libtracker-bus/meson.build b/src/libtracker-bus/meson.build
index 59464b204..775afc73f 100644
--- a/src/libtracker-bus/meson.build
+++ b/src/libtracker-bus/meson.build
@@ -4,7 +4,9 @@ libtracker_bus = static_library('tracker-bus',
     'tracker-bus-fd-cursor.vala',
     '../libtracker-common/libtracker-common.vapi',
     tracker_common_enum_header,
-    c_args: tracker_c_args,
+    c_args: tracker_c_args + [
+        '-include', 'libtracker-sparql/tracker-private.h',
+    ],
     vala_args: [
         '--debug',
         '--pkg', 'posix',
diff --git a/src/libtracker-data/meson.build b/src/libtracker-data/meson.build
index a3914819d..fc45aed0e 100644
--- a/src/libtracker-data/meson.build
+++ b/src/libtracker-data/meson.build
@@ -9,7 +9,9 @@ libtracker_data_vala = static_library('tracker-sparql-query',
     'libtracker-data.vapi',
     tracker_sparql_vapi,
     tracker_common_enum_header,
-    c_args: tracker_c_args,
+    c_args: tracker_c_args + [
+        '-include', 'libtracker-sparql/tracker-private.h',
+    ],
     vala_args: [
         '--debug',
         '--pkg', 'posix',
diff --git a/src/libtracker-data/tracker-db-interface-sqlite.c 
b/src/libtracker-data/tracker-db-interface-sqlite.c
index 9cd28e56c..90a7662e0 100644
--- a/src/libtracker-data/tracker-db-interface-sqlite.c
+++ b/src/libtracker-data/tracker-db-interface-sqlite.c
@@ -31,6 +31,7 @@
 #include <libtracker-common/tracker-parser.h>
 
 #include <libtracker-sparql/tracker-sparql.h>
+#include <libtracker-sparql/tracker-private.h>
 
 #if HAVE_TRACKER_FTS
 #include <libtracker-fts/tracker-fts.h>
diff --git a/src/libtracker-direct/meson.build b/src/libtracker-direct/meson.build
index 09bbac31a..c1ec244e9 100644
--- a/src/libtracker-direct/meson.build
+++ b/src/libtracker-direct/meson.build
@@ -1,7 +1,9 @@
 libtracker_direct = static_library('tracker-direct',
     'tracker-direct.c',
     'tracker-direct-statement.c',
-    c_args: tracker_c_args,
+    c_args: tracker_c_args + [
+       '-include', 'libtracker-sparql/tracker-private.h',
+    ],
     dependencies: [ glib, gio, tracker_data_dep, tracker_sparql_intermediate_dep ],
     include_directories: [commoninc, configinc, srcinc],
     gnu_symbol_visibility: 'hidden',
diff --git a/src/libtracker-remote/meson.build b/src/libtracker-remote/meson.build
index 838b141ce..87d073c49 100644
--- a/src/libtracker-remote/meson.build
+++ b/src/libtracker-remote/meson.build
@@ -10,7 +10,8 @@ sources = [
 libtracker_remote = static_library('tracker-remote', sources,
     dependencies: tracker_remote_dependencies + [tracker_common_dep, tracker_sparql_intermediate_dep],
     c_args: tracker_c_args + [
-        '-include', 'config.h'
+        '-include', 'config.h',
+        '-include', 'libtracker-sparql/tracker-private.h',
     ],
     vala_args: [
         '--debug',
diff --git a/src/libtracker-sparql-backend/meson.build b/src/libtracker-sparql-backend/meson.build
index e3704334b..ac16a9c79 100644
--- a/src/libtracker-sparql-backend/meson.build
+++ b/src/libtracker-sparql-backend/meson.build
@@ -12,6 +12,10 @@ libtracker_sparql = library('tracker-sparql-' + tracker_api_version,
     install: true,
     install_rpath: tracker_internal_libs_dir,
 
+    c_args: [
+       '-include', 'libtracker-sparql/tracker-private.h',
+    ],
+
     link_whole: [libtracker_sparql_intermediate],
 
     dependencies: [tracker_common_dep, tracker_sparql_remote_dep, tracker_sparql_bus_dep, 
tracker_sparql_direct_dep, libtracker_sparql_c_vapi_dep],
diff --git a/src/libtracker-sparql/tracker-connection.c b/src/libtracker-sparql/tracker-connection.c
index be578f4de..4fe64fabe 100644
--- a/src/libtracker-sparql/tracker-connection.c
+++ b/src/libtracker-sparql/tracker-connection.c
@@ -19,6 +19,7 @@
 #include "config.h"
 
 #include "tracker-connection.h"
+#include "tracker-private.h"
 
 G_DEFINE_ABSTRACT_TYPE (TrackerSparqlConnection, tracker_sparql_connection,
                         G_TYPE_OBJECT)
diff --git a/src/libtracker-sparql/tracker-connection.h b/src/libtracker-sparql/tracker-connection.h
index 1ae6071b3..6ceef43c7 100644
--- a/src/libtracker-sparql/tracker-connection.h
+++ b/src/libtracker-sparql/tracker-connection.h
@@ -83,71 +83,6 @@ typedef enum {
 
 #define TRACKER_SPARQL_ERROR tracker_sparql_error_quark ()
 
-struct _TrackerSparqlConnectionClass
-{
-       GObjectClass parent_class;
-
-        TrackerSparqlCursor * (* query) (TrackerSparqlConnection  *connection,
-                                         const gchar              *sparql,
-                                         GCancellable             *cancellable,
-                                         GError                  **error);
-       void (* query_async) (TrackerSparqlConnection *connection,
-                             const gchar             *sparql,
-                             GCancellable            *cancellable,
-                             GAsyncReadyCallback      callback,
-                             gpointer                 user_data);
-        TrackerSparqlCursor * (* query_finish) (TrackerSparqlConnection  *connection,
-                                                GAsyncResult             *res,
-                                                GError                  **error);
-        void (* update) (TrackerSparqlConnection  *connection,
-                         const gchar              *sparql,
-                         gint                      priority,
-                         GCancellable             *cancellable,
-                         GError                  **error);
-        void (* update_async) (TrackerSparqlConnection *connection,
-                               const gchar             *sparql,
-                               gint                     priority,
-                               GCancellable            *cancellable,
-                               GAsyncReadyCallback      callback,
-                               gpointer                 user_data);
-        void (* update_finish) (TrackerSparqlConnection  *connection,
-                                GAsyncResult             *res,
-                                GError                  **error);
-        void (* update_array_async) (TrackerSparqlConnection  *connection,
-                                     gchar                   **sparql,
-                                     gint                      sparql_length,
-                                     gint                      priority,
-                                     GCancellable             *cancellable,
-                                     GAsyncReadyCallback       callback,
-                                     gpointer                  user_data);
-        gboolean (* update_array_finish) (TrackerSparqlConnection  *connection,
-                                          GAsyncResult             *res,
-                                          GError                  **error);
-        GVariant* (* update_blank) (TrackerSparqlConnection  *connection,
-                                    const gchar              *sparql,
-                                    gint                      priority,
-                                    GCancellable             *cancellable,
-                                    GError                  **error);
-        void (* update_blank_async) (TrackerSparqlConnection *connection,
-                                     const gchar             *sparql,
-                                     gint                     priority,
-                                     GCancellable            *cancellable,
-                                     GAsyncReadyCallback      callback,
-                                     gpointer                 user_data);
-        GVariant* (* update_blank_finish) (TrackerSparqlConnection  *connection,
-                                           GAsyncResult             *res,
-                                           GError                  **error);
-        TrackerNamespaceManager * (* get_namespace_manager) (TrackerSparqlConnection *connection);
-        TrackerSparqlStatement * (* query_statement) (TrackerSparqlConnection  *connection,
-                                                      const gchar              *sparql,
-                                                      GCancellable             *cancellable,
-                                                      GError                  **error);
-       TrackerNotifier * (* create_notifier) (TrackerSparqlConnection *connection,
-                                              TrackerNotifierFlags     flags);
-
-       void (* close) (TrackerSparqlConnection *connection);
-};
-
 TRACKER_AVAILABLE_IN_ALL
 GQuark tracker_sparql_error_quark (void);
 
diff --git a/src/libtracker-sparql/tracker-cursor.c b/src/libtracker-sparql/tracker-cursor.c
index 2bc8efa73..65438840b 100644
--- a/src/libtracker-sparql/tracker-cursor.c
+++ b/src/libtracker-sparql/tracker-cursor.c
@@ -31,6 +31,7 @@
 #include "config.h"
 
 #include "tracker-cursor.h"
+#include "tracker-private.h"
 
 enum {
        PROP_0,
diff --git a/src/libtracker-sparql/tracker-cursor.h b/src/libtracker-sparql/tracker-cursor.h
index 73558a500..9d57cbf23 100644
--- a/src/libtracker-sparql/tracker-cursor.h
+++ b/src/libtracker-sparql/tracker-cursor.h
@@ -64,40 +64,6 @@ typedef enum {
        TRACKER_SPARQL_VALUE_TYPE_BOOLEAN,
 } TrackerSparqlValueType;
 
-struct _TrackerSparqlCursorClass
-{
-       GObjectClass parent_class;
-
-       TrackerSparqlValueType (* get_value_type) (TrackerSparqlCursor *cursor,
-                                                  gint                 column);
-        const gchar* (* get_variable_name) (TrackerSparqlCursor *cursor,
-                                            gint                 column);
-       const gchar* (* get_string) (TrackerSparqlCursor *cursor,
-                                    gint                 column,
-                                    glong               *length);
-        gboolean (* next) (TrackerSparqlCursor  *cursor,
-                           GCancellable         *cancellable,
-                           GError              **error);
-        void (* next_async) (TrackerSparqlCursor *cursor,
-                             GCancellable        *cancellable,
-                             GAsyncReadyCallback  callback,
-                             gpointer             user_data);
-        gboolean (* next_finish) (TrackerSparqlCursor  *cursor,
-                                  GAsyncResult         *res,
-                                  GError              **error);
-        void (* rewind) (TrackerSparqlCursor* cursor);
-        void (* close) (TrackerSparqlCursor* cursor);
-        gint64 (* get_integer) (TrackerSparqlCursor *cursor,
-                                gint                 column);
-        gdouble (* get_double) (TrackerSparqlCursor *cursor,
-                                gint                 column);
-        gboolean (* get_boolean) (TrackerSparqlCursor *cursor,
-                                  gint                 column);
-        gboolean (* is_bound) (TrackerSparqlCursor *cursor,
-                               gint                 column);
-        gint (* get_n_columns) (TrackerSparqlCursor *cursor);
-};
-
 TRACKER_AVAILABLE_IN_ALL
 TrackerSparqlConnection * tracker_sparql_cursor_get_connection (TrackerSparqlCursor *cursor);
 TRACKER_AVAILABLE_IN_ALL
diff --git a/src/libtracker-sparql/tracker-endpoint-dbus.c b/src/libtracker-sparql/tracker-endpoint-dbus.c
index 53f08b431..7da17fa67 100644
--- a/src/libtracker-sparql/tracker-endpoint-dbus.c
+++ b/src/libtracker-sparql/tracker-endpoint-dbus.c
@@ -23,6 +23,7 @@
 
 #include "tracker-endpoint-dbus.h"
 #include "tracker-notifier.h"
+#include "tracker-private.h"
 
 #include <gio/gio.h>
 #include <gio/gunixinputstream.h>
diff --git a/src/libtracker-sparql/tracker-endpoint-dbus.h b/src/libtracker-sparql/tracker-endpoint-dbus.h
index 300ab0b14..f355f4d2f 100644
--- a/src/libtracker-sparql/tracker-endpoint-dbus.h
+++ b/src/libtracker-sparql/tracker-endpoint-dbus.h
@@ -29,9 +29,17 @@
 #include <libtracker-sparql/tracker-endpoint.h>
 #include <libtracker-sparql/tracker-version.h>
 
-#define TRACKER_TYPE_ENDPOINT_DBUS tracker_endpoint_dbus_get_type()
+#define TRACKER_TYPE_ENDPOINT_DBUS         (tracker_endpoint_dbus_get_type())
+#define TRACKER_ENDPOINT_DBUS(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_ENDPOINT_DBUS, 
TrackerEndpointDBus))
+#define TRACKER_ENDPOINT_DBUS_CLASS(c)     (G_TYPE_CHECK_CLASS_CAST ((c), TRACKER_TYPE_ENDPOINT_DBUS, 
TrackerEndpointDBusClass))
+#define TRACKER_IS_ENDPOINT_DBUS(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_ENDPOINT_DBUS))
+#define TRACKER_IS_ENDPOINT_DBUS_CLASS(c)  (G_TYPE_CHECK_CLASS_TYPE ((c),  TRACKER_TYPE_ENDPOINT_DBUS))
+#define TRACKER_ENDPOINT_DBUS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TRACKER_TYPE_ENDPOINT_DBUS, 
TrackerEndpointDBusClass))
+
+typedef struct _TrackerEndpointDBus TrackerEndpointDBus;
+
 TRACKER_AVAILABLE_IN_ALL
-G_DECLARE_FINAL_TYPE (TrackerEndpointDBus, tracker_endpoint_dbus, TRACKER, ENDPOINT_DBUS, TrackerEndpoint)
+GType tracker_endpoint_dbus_get_type (void) G_GNUC_CONST;
 
 TRACKER_AVAILABLE_IN_ALL
 TrackerEndpointDBus *
diff --git a/src/libtracker-sparql/tracker-endpoint.c b/src/libtracker-sparql/tracker-endpoint.c
index 3efdb966c..0ae8cf9d7 100644
--- a/src/libtracker-sparql/tracker-endpoint.c
+++ b/src/libtracker-sparql/tracker-endpoint.c
@@ -22,6 +22,7 @@
 #include "config.h"
 
 #include "tracker-endpoint.h"
+#include "tracker-private.h"
 
 enum {
        PROP_0,
diff --git a/src/libtracker-sparql/tracker-endpoint.h b/src/libtracker-sparql/tracker-endpoint.h
index cc17a5b08..7ed53a450 100644
--- a/src/libtracker-sparql/tracker-endpoint.h
+++ b/src/libtracker-sparql/tracker-endpoint.h
@@ -28,15 +28,12 @@
 
 #include <glib-object.h>
 #include <libtracker-sparql/tracker-connection.h>
+#include <libtracker-sparql/tracker-version.h>
 
 #define TRACKER_TYPE_ENDPOINT tracker_endpoint_get_type()
 TRACKER_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE (TrackerEndpoint, tracker_endpoint, TRACKER, ENDPOINT, GObject)
 
-struct _TrackerEndpointClass {
-       GObjectClass parent_class;
-};
-
 TRACKER_AVAILABLE_IN_ALL
 TrackerSparqlConnection * tracker_endpoint_get_sparql_connection (TrackerEndpoint *endpoint);
 
diff --git a/src/libtracker-sparql/tracker-notifier.c b/src/libtracker-sparql/tracker-notifier.c
index c0c90db95..0a2f2c0f8 100644
--- a/src/libtracker-sparql/tracker-notifier.c
+++ b/src/libtracker-sparql/tracker-notifier.c
@@ -68,6 +68,7 @@
 #include "tracker-connection.h"
 #include "tracker-notifier.h"
 #include "tracker-notifier-private.h"
+#include "tracker-private.h"
 #include "tracker-sparql-enum-types.h"
 #include <libtracker-common/tracker-common.h>
 
diff --git a/src/libtracker-sparql/tracker-notifier.h b/src/libtracker-sparql/tracker-notifier.h
index fd0d9869e..dbcd09fba 100644
--- a/src/libtracker-sparql/tracker-notifier.h
+++ b/src/libtracker-sparql/tracker-notifier.h
@@ -34,16 +34,6 @@ G_DECLARE_DERIVABLE_TYPE (TrackerNotifier, tracker_notifier, TRACKER, NOTIFIER,
 
 typedef struct _TrackerNotifierEvent TrackerNotifierEvent;
 
-struct _TrackerNotifierClass {
-       GObjectClass parent_class;
-
-       void (* events) (TrackerNotifier *notifier,
-                        const GPtrArray *events);
-
-       /* <Private> */
-       gpointer padding[20];
-};
-
 /**
  * TrackerNotifierFlags:
  * @TRACKER_NOTIFIER_FLAG_NONE: No flags
diff --git a/src/libtracker-sparql/tracker-private.h b/src/libtracker-sparql/tracker-private.h
index 9aa2d109c..9d4060b04 100644
--- a/src/libtracker-sparql/tracker-private.h
+++ b/src/libtracker-sparql/tracker-private.h
@@ -22,6 +22,169 @@
 
 #include "tracker-cursor.h"
 
+typedef struct _TrackerSparqlConnectionClass TrackerSparqlConnectionClass;
+
+struct _TrackerSparqlConnectionClass
+{
+       GObjectClass parent_class;
+
+        TrackerSparqlCursor * (* query) (TrackerSparqlConnection  *connection,
+                                         const gchar              *sparql,
+                                         GCancellable             *cancellable,
+                                         GError                  **error);
+       void (* query_async) (TrackerSparqlConnection *connection,
+                             const gchar             *sparql,
+                             GCancellable            *cancellable,
+                             GAsyncReadyCallback      callback,
+                             gpointer                 user_data);
+        TrackerSparqlCursor * (* query_finish) (TrackerSparqlConnection  *connection,
+                                                GAsyncResult             *res,
+                                                GError                  **error);
+        void (* update) (TrackerSparqlConnection  *connection,
+                         const gchar              *sparql,
+                         gint                      priority,
+                         GCancellable             *cancellable,
+                         GError                  **error);
+        void (* update_async) (TrackerSparqlConnection *connection,
+                               const gchar             *sparql,
+                               gint                     priority,
+                               GCancellable            *cancellable,
+                               GAsyncReadyCallback      callback,
+                               gpointer                 user_data);
+        void (* update_finish) (TrackerSparqlConnection  *connection,
+                                GAsyncResult             *res,
+                                GError                  **error);
+        void (* update_array_async) (TrackerSparqlConnection  *connection,
+                                     gchar                   **sparql,
+                                     gint                      sparql_length,
+                                     gint                      priority,
+                                     GCancellable             *cancellable,
+                                     GAsyncReadyCallback       callback,
+                                     gpointer                  user_data);
+        gboolean (* update_array_finish) (TrackerSparqlConnection  *connection,
+                                          GAsyncResult             *res,
+                                          GError                  **error);
+        GVariant* (* update_blank) (TrackerSparqlConnection  *connection,
+                                    const gchar              *sparql,
+                                    gint                      priority,
+                                    GCancellable             *cancellable,
+                                    GError                  **error);
+        void (* update_blank_async) (TrackerSparqlConnection *connection,
+                                     const gchar             *sparql,
+                                     gint                     priority,
+                                     GCancellable            *cancellable,
+                                     GAsyncReadyCallback      callback,
+                                     gpointer                 user_data);
+        GVariant* (* update_blank_finish) (TrackerSparqlConnection  *connection,
+                                           GAsyncResult             *res,
+                                           GError                  **error);
+        TrackerNamespaceManager * (* get_namespace_manager) (TrackerSparqlConnection *connection);
+        TrackerSparqlStatement * (* query_statement) (TrackerSparqlConnection  *connection,
+                                                      const gchar              *sparql,
+                                                      GCancellable             *cancellable,
+                                                      GError                  **error);
+       TrackerNotifier * (* create_notifier) (TrackerSparqlConnection *connection,
+                                              TrackerNotifierFlags     flags);
+
+       void (* close) (TrackerSparqlConnection *connection);
+};
+
+typedef struct _TrackerSparqlCursorClass TrackerSparqlCursorClass;
+
+struct _TrackerSparqlCursorClass
+{
+       GObjectClass parent_class;
+
+       TrackerSparqlValueType (* get_value_type) (TrackerSparqlCursor *cursor,
+                                                  gint                 column);
+        const gchar* (* get_variable_name) (TrackerSparqlCursor *cursor,
+                                            gint                 column);
+       const gchar* (* get_string) (TrackerSparqlCursor *cursor,
+                                    gint                 column,
+                                    glong               *length);
+        gboolean (* next) (TrackerSparqlCursor  *cursor,
+                           GCancellable         *cancellable,
+                           GError              **error);
+        void (* next_async) (TrackerSparqlCursor *cursor,
+                             GCancellable        *cancellable,
+                             GAsyncReadyCallback  callback,
+                             gpointer             user_data);
+        gboolean (* next_finish) (TrackerSparqlCursor  *cursor,
+                                  GAsyncResult         *res,
+                                  GError              **error);
+        void (* rewind) (TrackerSparqlCursor* cursor);
+        void (* close) (TrackerSparqlCursor* cursor);
+        gint64 (* get_integer) (TrackerSparqlCursor *cursor,
+                                gint                 column);
+        gdouble (* get_double) (TrackerSparqlCursor *cursor,
+                                gint                 column);
+        gboolean (* get_boolean) (TrackerSparqlCursor *cursor,
+                                  gint                 column);
+        gboolean (* is_bound) (TrackerSparqlCursor *cursor,
+                               gint                 column);
+        gint (* get_n_columns) (TrackerSparqlCursor *cursor);
+};
+
+typedef struct _TrackerEndpointClass TrackerEndpointClass;
+
+struct _TrackerEndpointClass {
+       GObjectClass parent_class;
+};
+
+typedef struct _TrackerEndpointDBusClass TrackerEndpointDBusClass;
+
+struct _TrackerEndpointDBusClass {
+       struct _TrackerEndpointClass parent_class;
+};
+
+typedef struct _TrackerResourceClass TrackerResourceClass;
+
+struct _TrackerResourceClass
+{
+       GObjectClass parent_class;
+};
+
+typedef struct _TrackerSparqlStatementClass TrackerSparqlStatementClass;
+
+struct _TrackerSparqlStatementClass
+{
+       GObjectClass parent_class;
+
+        void (* bind_int) (TrackerSparqlStatement *stmt,
+                           const gchar            *name,
+                           gint64                  value);
+        void (* bind_boolean) (TrackerSparqlStatement *stmt,
+                               const gchar            *name,
+                               gboolean                value);
+        void (* bind_string) (TrackerSparqlStatement *stmt,
+                              const gchar            *name,
+                              const gchar            *value);
+        void (* bind_double) (TrackerSparqlStatement *stmt,
+                              const gchar            *name,
+                              gdouble                 value);
+
+        TrackerSparqlCursor * (* execute) (TrackerSparqlStatement  *stmt,
+                                           GCancellable            *cancellable,
+                                           GError                 **error);
+        void (* execute_async) (TrackerSparqlStatement *stmt,
+                                GCancellable           *cancellable,
+                                GAsyncReadyCallback     callback,
+                                gpointer                user_data);
+        TrackerSparqlCursor * (* execute_finish) (TrackerSparqlStatement  *stmt,
+                                                  GAsyncResult            *res,
+                                                  GError                 **error);
+       void (* clear_bindings) (TrackerSparqlStatement *stmt);
+};
+
+typedef struct _TrackerNotifierClass TrackerNotifierClass;
+
+struct _TrackerNotifierClass {
+       GObjectClass parent_class;
+
+       void (* events) (TrackerNotifier *notifier,
+                        const GPtrArray *events);
+};
+
 void tracker_sparql_cursor_set_connection (TrackerSparqlCursor     *cursor,
                                            TrackerSparqlConnection *connection);
 
diff --git a/src/libtracker-sparql/tracker-resource.c b/src/libtracker-sparql/tracker-resource.c
index c0a4aa3fe..bf0c40a4c 100644
--- a/src/libtracker-sparql/tracker-resource.c
+++ b/src/libtracker-sparql/tracker-resource.c
@@ -31,6 +31,8 @@
 /* For tracker_sparql_escape_string */
 #include "tracker-utils.h"
 
+#include <tracker-private.h>
+
 typedef struct {
        char *identifier;
        GHashTable *properties;
diff --git a/src/libtracker-sparql/tracker-resource.h b/src/libtracker-sparql/tracker-resource.h
index 91d934bdd..85a110389 100644
--- a/src/libtracker-sparql/tracker-resource.h
+++ b/src/libtracker-sparql/tracker-resource.h
@@ -30,11 +30,6 @@ G_BEGIN_DECLS
 TRACKER_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE (TrackerResource, tracker_resource, TRACKER, RESOURCE, GObject)
 
-struct _TrackerResourceClass
-{
-       GObjectClass parent_class;
-};
-
 TRACKER_AVAILABLE_IN_ALL
 TrackerResource *tracker_resource_new (const char *identifier);
 
diff --git a/src/libtracker-sparql/tracker-statement.c b/src/libtracker-sparql/tracker-statement.c
index e46e0825e..46d09823c 100644
--- a/src/libtracker-sparql/tracker-statement.c
+++ b/src/libtracker-sparql/tracker-statement.c
@@ -43,6 +43,7 @@
 #include "config.h"
 
 #include "tracker-statement.h"
+#include "tracker-private.h"
 
 enum {
        PROP_0,
diff --git a/src/libtracker-sparql/tracker-statement.h b/src/libtracker-sparql/tracker-statement.h
index b690dbd5d..822edddfa 100644
--- a/src/libtracker-sparql/tracker-statement.h
+++ b/src/libtracker-sparql/tracker-statement.h
@@ -37,36 +37,6 @@ G_DECLARE_DERIVABLE_TYPE (TrackerSparqlStatement,
 #include "tracker-connection.h"
 #include "tracker-cursor.h"
 
-struct _TrackerSparqlStatementClass
-{
-       GObjectClass parent_class;
-
-        void (* bind_int) (TrackerSparqlStatement *stmt,
-                           const gchar            *name,
-                           gint64                  value);
-        void (* bind_boolean) (TrackerSparqlStatement *stmt,
-                               const gchar            *name,
-                               gboolean                value);
-        void (* bind_string) (TrackerSparqlStatement *stmt,
-                              const gchar            *name,
-                              const gchar            *value);
-        void (* bind_double) (TrackerSparqlStatement *stmt,
-                              const gchar            *name,
-                              gdouble                 value);
-
-        TrackerSparqlCursor * (* execute) (TrackerSparqlStatement  *stmt,
-                                           GCancellable            *cancellable,
-                                           GError                 **error);
-        void (* execute_async) (TrackerSparqlStatement *stmt,
-                                GCancellable           *cancellable,
-                                GAsyncReadyCallback     callback,
-                                gpointer                user_data);
-        TrackerSparqlCursor * (* execute_finish) (TrackerSparqlStatement  *stmt,
-                                                  GAsyncResult            *res,
-                                                  GError                 **error);
-       void (* clear_bindings) (TrackerSparqlStatement *stmt);
-};
-
 TRACKER_AVAILABLE_IN_ALL
 TrackerSparqlConnection * tracker_sparql_statement_get_connection (TrackerSparqlStatement *stmt);
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]