[libgxps] Do not export methods that are supposed to be private



commit cc8b43990d7cce2a58d5bf2818db701d2f284442
Author: Ignacio Casal Quinteiro <ignacio casal nice-software com>
Date:   Sat Jan 28 10:17:35 2017 +0100

    Do not export methods that are supposed to be private
    
    At some point when I added the export flag to the methods I
    wanted to match what the regex was exporting, though these
    methods are private and I think we can safely stop exporting
    them since I hope evince is not actually using them.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=777865

 libgxps/Makefile.am         |    2 +-
 libgxps/gxps-archive.h      |    7 -------
 libgxps/gxps-brush.h        |    4 ----
 libgxps/gxps-color.h        |    1 -
 libgxps/gxps-fonts.h        |    1 -
 libgxps/gxps-glyphs.h       |    4 ----
 libgxps/gxps-images.h       |    2 --
 libgxps/gxps-matrix.h       |    4 ----
 libgxps/gxps-page-private.h |    7 -------
 libgxps/gxps-parse-utils.h  |   10 ----------
 libgxps/gxps-path.h         |    4 ----
 11 files changed, 1 insertions(+), 45 deletions(-)
---
diff --git a/libgxps/Makefile.am b/libgxps/Makefile.am
index 57cc9c8..bdff76a 100644
--- a/libgxps/Makefile.am
+++ b/libgxps/Makefile.am
@@ -55,7 +55,7 @@ INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --warn-all --identifie
 INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
 
 if HAVE_INTROSPECTION
-introspection_sources = $(filter-out $(NOINST_H_FILES) gxps-archive.c gxps-fonts.c gxps-images.c 
gxps-parse-utils.c gxps-version.h, $(libgxps_la_SOURCES))
+introspection_sources = $(filter-out $(GXPS_BASE_NOINST_H_FILES) gxps-archive.c gxps-fonts.c gxps-images.c 
gxps-parse-utils.c gxps-version.h, $(libgxps_la_SOURCES))
 
 GXPS-0.1.gir: libgxps.la
 GXPS_0_1_gir_INCLUDES = GObject-2.0 Gio-2.0 cairo-1.0
diff --git a/libgxps/gxps-archive.h b/libgxps/gxps-archive.h
index 84c2bfb..4029fa1 100644
--- a/libgxps/gxps-archive.h
+++ b/libgxps/gxps-archive.h
@@ -37,20 +37,13 @@ G_BEGIN_DECLS
 typedef struct _GXPSArchive      GXPSArchive;
 typedef struct _GXPSArchiveClass GXPSArchiveClass;
 
-GXPS_AVAILABLE_IN_ALL
 GType             gxps_archive_get_type       (void) G_GNUC_CONST;
-
-GXPS_AVAILABLE_IN_ALL
 GXPSArchive      *gxps_archive_new            (GFile            *filename,
                                               GError          **error);
-
-GXPS_AVAILABLE_IN_ALL
 gboolean          gxps_archive_has_entry      (GXPSArchive      *archive,
                                               const gchar      *path);
-GXPS_AVAILABLE_IN_ALL
 GInputStream     *gxps_archive_open           (GXPSArchive      *archive,
                                               const gchar      *path);
-GXPS_AVAILABLE_IN_ALL
 gboolean          gxps_archive_read_entry     (GXPSArchive      *archive,
                                               const gchar      *path,
                                               guchar          **buffer,
diff --git a/libgxps/gxps-brush.h b/libgxps/gxps-brush.h
index d101130..be3d3ff 100644
--- a/libgxps/gxps-brush.h
+++ b/libgxps/gxps-brush.h
@@ -33,16 +33,12 @@ struct _GXPSBrush {
         gdouble            opacity;
 };
 
-GXPS_AVAILABLE_IN_ALL
 GXPSBrush *gxps_brush_new               (GXPSRenderContext   *ctx);
-GXPS_AVAILABLE_IN_ALL
 void       gxps_brush_free              (GXPSBrush           *brush);
-GXPS_AVAILABLE_IN_ALL
 gboolean   gxps_brush_solid_color_parse (const gchar         *data,
                                          GXPSArchive         *zip,
                                          gdouble              alpha,
                                          cairo_pattern_t    **pattern);
-GXPS_AVAILABLE_IN_ALL
 void       gxps_brush_parser_push       (GMarkupParseContext *context,
                                          GXPSBrush           *brush);
 
diff --git a/libgxps/gxps-color.h b/libgxps/gxps-color.h
index efd8aeb..232693f 100644
--- a/libgxps/gxps-color.h
+++ b/libgxps/gxps-color.h
@@ -34,7 +34,6 @@ typedef struct _GXPSColor {
         gdouble blue;
 } GXPSColor;
 
-GXPS_AVAILABLE_IN_ALL
 gboolean gxps_color_new_for_icc (GXPSArchive *zip,
                                  const gchar *icc_profile_uri,
                                  gdouble     *values,
diff --git a/libgxps/gxps-fonts.h b/libgxps/gxps-fonts.h
index 90fc432..a127c6f 100644
--- a/libgxps/gxps-fonts.h
+++ b/libgxps/gxps-fonts.h
@@ -25,7 +25,6 @@
 
 G_BEGIN_DECLS
 
-GXPS_AVAILABLE_IN_ALL
 cairo_font_face_t *gxps_fonts_get_font (GXPSArchive *zip,
                                        const gchar *font_uri,
                                        GError     **error);
diff --git a/libgxps/gxps-glyphs.h b/libgxps/gxps-glyphs.h
index 8121137..1e35c7c 100644
--- a/libgxps/gxps-glyphs.h
+++ b/libgxps/gxps-glyphs.h
@@ -45,15 +45,12 @@ struct _GXPSGlyphs {
         guint              italic      : 1;
 };
 
-GXPS_AVAILABLE_IN_ALL
 GXPSGlyphs *gxps_glyphs_new             (GXPSRenderContext     *ctx,
                                          gchar                 *font_uri,
                                          gdouble                font_size,
                                          gdouble                origin_x,
                                          gdouble                origin_y);
-GXPS_AVAILABLE_IN_ALL
 void        gxps_glyphs_free            (GXPSGlyphs            *glyphs);
-GXPS_AVAILABLE_IN_ALL
 gboolean    gxps_glyphs_to_cairo_glyphs (GXPSGlyphs            *gxps_glyphs,
                                          cairo_scaled_font_t   *scaled_font,
                                          const gchar           *utf8,
@@ -62,7 +59,6 @@ gboolean    gxps_glyphs_to_cairo_glyphs (GXPSGlyphs            *gxps_glyphs,
                                          cairo_text_cluster_t **clusters,
                                          int                   *num_clusters,
                                          GError               **error);
-GXPS_AVAILABLE_IN_ALL
 void        gxps_glyphs_parser_push     (GMarkupParseContext   *context,
                                          GXPSGlyphs            *glyphs);
 
diff --git a/libgxps/gxps-images.h b/libgxps/gxps-images.h
index fdf35f9..81cfdc9 100644
--- a/libgxps/gxps-images.h
+++ b/libgxps/gxps-images.h
@@ -33,11 +33,9 @@ struct _GXPSImage {
        double           res_y;
 };
 
-GXPS_AVAILABLE_IN_ALL
 GXPSImage *gxps_images_get_image (GXPSArchive  *zip,
                                   const gchar  *image_uri,
                                   GError      **error);
-GXPS_AVAILABLE_IN_ALL
 void       gxps_image_free       (GXPSImage    *image);
 
 G_END_DECLS
diff --git a/libgxps/gxps-matrix.h b/libgxps/gxps-matrix.h
index 3693d53..215ea34 100644
--- a/libgxps/gxps-matrix.h
+++ b/libgxps/gxps-matrix.h
@@ -32,14 +32,10 @@ struct _GXPSMatrix {
         cairo_matrix_t     matrix;
 };
 
-GXPS_AVAILABLE_IN_ALL
 GXPSMatrix *gxps_matrix_new         (GXPSRenderContext   *ctx);
-GXPS_AVAILABLE_IN_ALL
 void        gxps_matrix_free        (GXPSMatrix          *matrix);
-GXPS_AVAILABLE_IN_ALL
 gboolean    gxps_matrix_parse       (const gchar         *data,
                                      cairo_matrix_t      *matrix);
-GXPS_AVAILABLE_IN_ALL
 void        gxps_matrix_parser_push (GMarkupParseContext *context,
                                      GXPSMatrix          *matrix);
 
diff --git a/libgxps/gxps-page-private.h b/libgxps/gxps-page-private.h
index f4d299c..9dab52c 100644
--- a/libgxps/gxps-page-private.h
+++ b/libgxps/gxps-page-private.h
@@ -58,16 +58,9 @@ struct _GXPSRenderContext {
         GXPSBrushVisual *visual;
 };
 
-/* FIXME: these methods are suppose to be private but they were exported
- * before adding the AVALABLE macros, so we keep them exported to not break
- * the abi. If in the future we break the abi for some reason we could remove
- * these exports.
- */
-GXPS_AVAILABLE_IN_ALL
 GXPSImage *gxps_page_get_image          (GXPSPage            *page,
                                          const gchar         *image_uri,
                                          GError             **error);
-GXPS_AVAILABLE_IN_ALL
 void       gxps_page_render_parser_push (GMarkupParseContext *context,
                                          GXPSRenderContext   *ctx);
 
diff --git a/libgxps/gxps-parse-utils.h b/libgxps/gxps-parse-utils.h
index 9392c17..d5cb341 100644
--- a/libgxps/gxps-parse-utils.h
+++ b/libgxps/gxps-parse-utils.h
@@ -24,11 +24,9 @@
 
 G_BEGIN_DECLS
 
-GXPS_AVAILABLE_IN_ALL
 gboolean gxps_parse_stream                  (GMarkupParseContext  *context,
                                              GInputStream         *stream,
                                              GError              **error);
-GXPS_AVAILABLE_IN_ALL
 void     gxps_parse_error                   (GMarkupParseContext  *context,
                                              const gchar          *source,
                                              GMarkupError          error_type,
@@ -36,29 +34,21 @@ void     gxps_parse_error                   (GMarkupParseContext  *context,
                                              const gchar          *attribute_name,
                                              const gchar          *content,
                                              GError              **error);
-GXPS_AVAILABLE_IN_ALL
 gboolean gxps_value_get_int                 (const gchar          *value,
                                              gint                 *int_value);
-GXPS_AVAILABLE_IN_ALL
 gboolean gxps_value_get_double              (const gchar          *value,
                                              gdouble              *double_value);
-GXPS_AVAILABLE_IN_ALL
 gboolean gxps_value_get_double_positive     (const gchar          *value,
                                              gdouble              *double_value);
-GXPS_AVAILABLE_IN_ALL
 gboolean gxps_value_get_double_non_negative (const gchar          *value,
                                              gdouble              *double_value);
-GXPS_AVAILABLE_IN_ALL
 gboolean gxps_value_get_boolean             (const gchar          *value,
                                              gboolean             *boolean_value);
-GXPS_AVAILABLE_IN_ALL
 gboolean gxps_point_parse                   (const gchar          *point,
                                              gdouble              *x,
                                              gdouble              *y);
-GXPS_AVAILABLE_IN_ALL
 void     gxps_parse_skip_number             (gchar               **iter,
                                              const gchar          *end);
-GXPS_AVAILABLE_IN_ALL
 gchar   *gxps_resolve_relative_path         (const gchar          *source,
                                              const gchar          *target);
 
diff --git a/libgxps/gxps-path.h b/libgxps/gxps-path.h
index 0524e5e..fd21982 100644
--- a/libgxps/gxps-path.h
+++ b/libgxps/gxps-path.h
@@ -50,16 +50,12 @@ struct _GXPSPath {
         gboolean           is_closed  : 1;
 };
 
-GXPS_AVAILABLE_IN_ALL
 GXPSPath *gxps_path_new         (GXPSRenderContext   *ctx);
-GXPS_AVAILABLE_IN_ALL
 void      gxps_path_free        (GXPSPath            *path);
-GXPS_AVAILABLE_IN_ALL
 gboolean  gxps_path_parse       (const gchar         *data,
                                  cairo_t             *cr,
                                  GError             **error);
 
-GXPS_AVAILABLE_IN_ALL
 void      gxps_path_parser_push (GMarkupParseContext *context,
                                  GXPSPath            *path);
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]