GNOME.org
 

[tracker/wip/carlosg/shuffle-dirs: 8/15] libtracker-data: Drop single-header usage guards


commit 25107a9bf53df04c02348e74cb049b2c402c6e00
Author: Carlos Garnacho <carlosg gnome org>
Date:   Sun Apr 3 13:49:39 2022 +0200

    libtracker-data: Drop single-header usage guards
    
    This only makes sense for public libraries, which libtracker-data
    is not. Assume tracker internals do know what they are including,
    we did either way.

 src/libtracker-data/tracker-class.h               | 4 ----
 src/libtracker-data/tracker-collation.h           | 4 ----
 src/libtracker-data/tracker-data-manager.h        | 4 ----
 src/libtracker-data/tracker-data-query.h          | 4 ----
 src/libtracker-data/tracker-data-update.h         | 4 ----
 src/libtracker-data/tracker-data.h                | 8 --------
 src/libtracker-data/tracker-db-interface-sqlite.h | 4 ----
 src/libtracker-data/tracker-db-interface.h        | 4 ----
 src/libtracker-data/tracker-db-manager.h          | 4 ----
 src/libtracker-data/tracker-namespace.h           | 4 ----
 src/libtracker-data/tracker-ontologies.h          | 4 ----
 src/libtracker-data/tracker-ontology.h            | 4 ----
 src/libtracker-data/tracker-property.h            | 4 ----
 src/libtracker-data/tracker-sparql.h              | 4 ----
 14 files changed, 60 deletions(-)
---
diff --git a/src/libtracker-data/tracker-class.h b/src/libtracker-data/tracker-class.h
index c57631595..9825cb790 100644
--- a/src/libtracker-data/tracker-class.h
+++ b/src/libtracker-data/tracker-class.h
@@ -27,10 +27,6 @@
 
 G_BEGIN_DECLS
 
-#if !defined (__LIBTRACKER_DATA_INSIDE__) && !defined (TRACKER_COMPILATION)
-#error "only <libtracker-data/tracker-data.h> must be included directly."
-#endif
-
 #define TRACKER_TYPE_CLASS         (tracker_class_get_type ())
 #define TRACKER_CLASS(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_CLASS, TrackerClass))
 #define TRACKER_CLASS_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), TRACKER_TYPE_CLASS, TrackerClassClass))
diff --git a/src/libtracker-data/tracker-collation.h b/src/libtracker-data/tracker-collation.h
index d3e5af18d..95551a9f0 100644
--- a/src/libtracker-data/tracker-collation.h
+++ b/src/libtracker-data/tracker-collation.h
@@ -22,10 +22,6 @@
 
 G_BEGIN_DECLS
 
-#if !defined (__LIBTRACKER_COMMON_INSIDE__) && !defined (TRACKER_COMPILATION)
-#error "only <libtracker-common/tracker-common.h> must be included directly."
-#endif
-
 gpointer tracker_collation_init     (void);
 void     tracker_collation_shutdown (gpointer      collator);
 gint     tracker_collation_utf8     (gpointer      collator,
diff --git a/src/libtracker-data/tracker-data-manager.h b/src/libtracker-data/tracker-data-manager.h
index 6a85c49ab..42220b8f5 100644
--- a/src/libtracker-data/tracker-data-manager.h
+++ b/src/libtracker-data/tracker-data-manager.h
@@ -23,10 +23,6 @@
 #ifndef __LIBTRACKER_DATA_MANAGER_H__
 #define __LIBTRACKER_DATA_MANAGER_H__
 
-#if !defined (__LIBTRACKER_DATA_INSIDE__) && !defined (TRACKER_COMPILATION)
-#error "only <libtracker-data/tracker-data.h> must be included directly."
-#endif
-
 #include <glib.h>
 
 G_BEGIN_DECLS
diff --git a/src/libtracker-data/tracker-data-query.h b/src/libtracker-data/tracker-data-query.h
index 254ae97ce..94d84400d 100644
--- a/src/libtracker-data/tracker-data-query.h
+++ b/src/libtracker-data/tracker-data-query.h
@@ -30,10 +30,6 @@
 
 G_BEGIN_DECLS
 
-#if !defined (__LIBTRACKER_DATA_INSIDE__) && !defined (TRACKER_COMPILATION)
-#error "only <libtracker-data/tracker-data.h> must be included directly."
-#endif
-
 gchar *              tracker_data_query_resource_urn  (TrackerDataManager  *manager,
                                                        TrackerDBInterface  *iface,
                                                        TrackerRowid         id);
diff --git a/src/libtracker-data/tracker-data-update.h b/src/libtracker-data/tracker-data-update.h
index 5954e4721..f11d227b7 100644
--- a/src/libtracker-data/tracker-data-update.h
+++ b/src/libtracker-data/tracker-data-update.h
@@ -21,10 +21,6 @@
 #ifndef __LIBTRACKER_DATA_UPDATE_H__
 #define __LIBTRACKER_DATA_UPDATE_H__
 
-#if !defined (__LIBTRACKER_DATA_INSIDE__) && !defined (TRACKER_COMPILATION)
-#error "only <libtracker-data/tracker-data.h> must be included directly."
-#endif
-
 #include <glib.h>
 #include <gio/gio.h>
 
diff --git a/src/libtracker-data/tracker-data.h b/src/libtracker-data/tracker-data.h
index 8d61f02e4..b82100a58 100644
--- a/src/libtracker-data/tracker-data.h
+++ b/src/libtracker-data/tracker-data.h
@@ -20,12 +20,6 @@
 #ifndef __LIBTRACKER_DATA_H__
 #define __LIBTRACKER_DATA_H__
 
-#if !defined (TRACKER_ENABLE_INTERNALS) && !defined (TRACKER_COMPILATION)
-#error "TRACKER_ENABLE_INTERNALS not defined, this must be defined to use tracker's internal functions"
-#endif
-
-#define __LIBTRACKER_DATA_INSIDE__
-
 #include "tracker-class.h"
 #include "tracker-data-manager.h"
 #include "tracker-data-query.h"
@@ -40,6 +34,4 @@
 #include "tracker-sparql.h"
 #include "tracker-uuid.h"
 
-#undef __LIBTRACKER_DATA_INSIDE__
-
 #endif /* __LIBTRACKER_DATA_H__ */
diff --git a/src/libtracker-data/tracker-db-interface-sqlite.h 
b/src/libtracker-data/tracker-db-interface-sqlite.h
index 6659fcd10..98fc4d7ee 100644
--- a/src/libtracker-data/tracker-db-interface-sqlite.h
+++ b/src/libtracker-data/tracker-db-interface-sqlite.h
@@ -26,10 +26,6 @@
 
 G_BEGIN_DECLS
 
-#if !defined (__LIBTRACKER_DATA_INSIDE__) && !defined (TRACKER_COMPILATION)
-#error "only <libtracker-data/tracker-data.h> must be included directly."
-#endif
-
 #define TRACKER_COLLATION_NAME "TRACKER"
 #define TRACKER_TITLE_COLLATION_NAME "TRACKER_TITLE"
 
diff --git a/src/libtracker-data/tracker-db-interface.h b/src/libtracker-data/tracker-db-interface.h
index 66aa31b63..7c4e4c497 100644
--- a/src/libtracker-data/tracker-db-interface.h
+++ b/src/libtracker-data/tracker-db-interface.h
@@ -29,10 +29,6 @@
 
 G_BEGIN_DECLS
 
-#if !defined (__LIBTRACKER_DATA_INSIDE__) && !defined (TRACKER_COMPILATION)
-#error "only <libtracker-data/tracker-data.h> must be included directly."
-#endif
-
 #define TRACKER_TYPE_DB_INTERFACE           (tracker_db_interface_get_type ())
 #define TRACKER_DB_INTERFACE(obj)           (G_TYPE_CHECK_INSTANCE_CAST ((obj), TRACKER_TYPE_DB_INTERFACE, 
TrackerDBInterface))
 #define TRACKER_DB_INTERFACE_CLASS(c)       (G_TYPE_CHECK_CLASS_CAST ((c),      TRACKER_TYPE_DB_INTERFACE, 
TrackerDBInterfaceClass))
diff --git a/src/libtracker-data/tracker-db-manager.h b/src/libtracker-data/tracker-db-manager.h
index 664b55362..941ecad9d 100644
--- a/src/libtracker-data/tracker-db-manager.h
+++ b/src/libtracker-data/tracker-db-manager.h
@@ -26,10 +26,6 @@
 
 G_BEGIN_DECLS
 
-#if !defined (__LIBTRACKER_DATA_INSIDE__) && !defined (TRACKER_COMPILATION)
-#error "only <libtracker-data/tracker-data.h> must be included directly."
-#endif
-
 #define TRACKER_TYPE_DB_MANAGER (tracker_db_manager_get_type ())
 G_DECLARE_FINAL_TYPE (TrackerDBManager, tracker_db_manager,
                       TRACKER, DB_MANAGER, GObject)
diff --git a/src/libtracker-data/tracker-namespace.h b/src/libtracker-data/tracker-namespace.h
index 4ae2154a3..c9081d0da 100644
--- a/src/libtracker-data/tracker-namespace.h
+++ b/src/libtracker-data/tracker-namespace.h
@@ -25,10 +25,6 @@
 
 G_BEGIN_DECLS
 
-#if !defined (__LIBTRACKER_DATA_INSIDE__) && !defined (TRACKER_COMPILATION)
-#error "only <libtracker-data/tracker-data.h> must be included directly."
-#endif
-
 #define TRACKER_TYPE_NAMESPACE         (tracker_namespace_get_type ())
 #define TRACKER_NAMESPACE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_NAMESPACE, 
TrackerNamespace))
 #define TRACKER_NAMESPACE_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), TRACKER_TYPE_NAMESPACE, 
TrackerNamespaceClass))
diff --git a/src/libtracker-data/tracker-ontologies.h b/src/libtracker-data/tracker-ontologies.h
index 529be25fa..6abcd5830 100644
--- a/src/libtracker-data/tracker-ontologies.h
+++ b/src/libtracker-data/tracker-ontologies.h
@@ -30,10 +30,6 @@
 
 G_BEGIN_DECLS
 
-#if !defined (__LIBTRACKER_DATA_INSIDE__) && !defined (TRACKER_COMPILATION)
-#error "only <libtracker-data/tracker-data.h> must be included directly."
-#endif
-
 #define TRACKER_TYPE_ONTOLOGIES         (tracker_ontologies_get_type ())
 #define TRACKER_ONTOLOGIES(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_ONTOLOGIES, 
TrackerOntologies))
 #define TRACKER_ONTOLOGIES_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), TRACKER_TYPE_ONTOLOGIES, 
TrackerOntologiesClass))
diff --git a/src/libtracker-data/tracker-ontology.h b/src/libtracker-data/tracker-ontology.h
index f1cad56ee..615c984b0 100644
--- a/src/libtracker-data/tracker-ontology.h
+++ b/src/libtracker-data/tracker-ontology.h
@@ -27,10 +27,6 @@
 
 G_BEGIN_DECLS
 
-#if !defined (__LIBTRACKER_DATA_INSIDE__) && !defined (TRACKER_COMPILATION)
-#error "only <libtracker-data/tracker-data.h> must be included directly."
-#endif
-
 #define TRACKER_TYPE_ONTOLOGY         (tracker_ontology_get_type ())
 #define TRACKER_ONTOLOGY(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_ONTOLOGY, 
TrackerOntology))
 #define TRACKER_ONTOLOGY_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), TRACKER_TYPE_ONTOLOGY, 
TrackerOntologyClass))
diff --git a/src/libtracker-data/tracker-property.h b/src/libtracker-data/tracker-property.h
index 84e98b5f5..5d8794ebe 100644
--- a/src/libtracker-data/tracker-property.h
+++ b/src/libtracker-data/tracker-property.h
@@ -26,10 +26,6 @@
 
 G_BEGIN_DECLS
 
-#if !defined (__LIBTRACKER_DATA_INSIDE__) && !defined (TRACKER_COMPILATION)
-#error "only <libtracker-data/tracker-data.h> must be included directly."
-#endif
-
 /*
  * TrackerPropertyType
  */
diff --git a/src/libtracker-data/tracker-sparql.h b/src/libtracker-data/tracker-sparql.h
index 29c881cc9..4959c7589 100644
--- a/src/libtracker-data/tracker-sparql.h
+++ b/src/libtracker-data/tracker-sparql.h
@@ -21,10 +21,6 @@
 #ifndef __TRACKER_SPARQL_H__
 #define __TRACKER_SPARQL_H__
 
-#if !defined (__LIBTRACKER_DATA_INSIDE__) && !defined (TRACKER_COMPILATION)
-#error "only <libtracker-data/tracker-data.h> must be included directly."
-#endif
-
 #include <glib.h>
 #include "tracker-data-manager.h"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]