diff options
-rw-r--r-- | libappstream-glib/Makefile.am | 6 | ||||
-rw-r--r-- | libappstream-glib/as-app-private.h | 43 | ||||
-rw-r--r-- | libappstream-glib/as-app.c | 8 | ||||
-rw-r--r-- | libappstream-glib/as-app.h | 5 | ||||
-rw-r--r-- | libappstream-glib/as-image-private.h | 41 | ||||
-rw-r--r-- | libappstream-glib/as-image.c | 6 | ||||
-rw-r--r-- | libappstream-glib/as-image.h | 7 | ||||
-rw-r--r-- | libappstream-glib/as-node-private.h | 40 | ||||
-rw-r--r-- | libappstream-glib/as-node.c | 4 | ||||
-rw-r--r-- | libappstream-glib/as-node.h | 3 | ||||
-rw-r--r-- | libappstream-glib/as-release-private.h | 41 | ||||
-rw-r--r-- | libappstream-glib/as-release.c | 6 | ||||
-rw-r--r-- | libappstream-glib/as-release.h | 7 | ||||
-rw-r--r-- | libappstream-glib/as-screenshot-private.h | 43 | ||||
-rw-r--r-- | libappstream-glib/as-screenshot.c | 5 | ||||
-rw-r--r-- | libappstream-glib/as-screenshot.h | 7 | ||||
-rw-r--r-- | libappstream-glib/as-self-test.c | 12 | ||||
-rw-r--r-- | libappstream-glib/as-store.c | 1 | ||||
-rw-r--r-- | libappstream-glib/as-utils-private.h | 40 | ||||
-rw-r--r-- | libappstream-glib/as-utils.c | 1 | ||||
-rw-r--r-- | libappstream-glib/as-utils.h | 6 |
21 files changed, 280 insertions, 52 deletions
diff --git a/libappstream-glib/Makefile.am b/libappstream-glib/Makefile.am index 9b4835b..dc6f1c5 100644 --- a/libappstream-glib/Makefile.am +++ b/libappstream-glib/Makefile.am @@ -35,13 +35,19 @@ libappstream_glib_include_HEADERS = \ libappstream_glib_la_SOURCES = \ as-app.c \ + as-app-private.h \ as-image.c \ + as-image-private.h \ as-node.c \ + as-node-private.h \ as-release.c \ + as-release-private.h \ as-screenshot.c \ + as-screenshot-private.h \ as-store.c \ as-tag.c \ as-utils.c \ + as-utils-private.h \ as-version.h CLEANFILES = $(BUILT_SOURCES) diff --git a/libappstream-glib/as-app-private.h b/libappstream-glib/as-app-private.h new file mode 100644 index 0000000..6d508b1 --- /dev/null +++ b/libappstream-glib/as-app-private.h @@ -0,0 +1,43 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- + * + * Copyright (C) 2014 Richard Hughes <richard@hughsie.com> + * + * Licensed under the GNU Lesser General Public License Version 2.1 + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#if !defined (__APPSTREAM_GLIB_PRIVATE_H) && !defined (AS_COMPILATION) +#error "Only <appstream-glib.h> can be included directly." +#endif + +#ifndef __AS_APP_PRIVATE_H +#define __AS_APP_PRIVATE_H + +#include <glib-object.h> + +#include "as-app.h" + +G_BEGIN_DECLS + +GNode *as_app_node_insert (AsApp *app, + GNode *parent); +gboolean as_app_node_parse (AsApp *app, + GNode *node, + GError **error); + +G_END_DECLS + +#endif /* __AS_APP_PRIVATE_H */ diff --git a/libappstream-glib/as-app.c b/libappstream-glib/as-app.c index a776e73..33a161f 100644 --- a/libappstream-glib/as-app.c +++ b/libappstream-glib/as-app.c @@ -21,10 +21,12 @@ #include "config.h" -#include "as-app.h" -#include "as-node.h" +#include "as-app-private.h" +#include "as-node-private.h" +#include "as-release-private.h" +#include "as-screenshot-private.h" #include "as-tag.h" -#include "as-utils.h" +#include "as-utils-private.h" typedef struct _AsAppPrivate AsAppPrivate; struct _AsAppPrivate diff --git a/libappstream-glib/as-app.h b/libappstream-glib/as-app.h index ee1cf51..60d753a 100644 --- a/libappstream-glib/as-app.h +++ b/libappstream-glib/as-app.h @@ -201,11 +201,6 @@ void as_app_remove_metadata (AsApp *app, const gchar *key); /* object methods */ -GNode *as_app_node_insert (AsApp *app, - GNode *parent); -gboolean as_app_node_parse (AsApp *app, - GNode *node, - GError **error); void as_app_subsume (AsApp *app, AsApp *donor); guint as_app_search_matches (AsApp *app, diff --git a/libappstream-glib/as-image-private.h b/libappstream-glib/as-image-private.h new file mode 100644 index 0000000..d3098f8 --- /dev/null +++ b/libappstream-glib/as-image-private.h @@ -0,0 +1,41 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- + * + * Copyright (C) 2014 Richard Hughes <richard@hughsie.com> + * + * Licensed under the GNU Lesser General Public License Version 2.1 + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#if !defined (__APPSTREAM_GLIB_PRIVATE_H) && !defined (AS_COMPILATION) +#error "Only <appstream-glib.h> can be included directly." +#endif + +#ifndef __AS_IMAGE_PRIVATE_H +#define __AS_IMAGE_PRIVATE_H + +#include "as-image.h" + +G_BEGIN_DECLS + +GNode *as_image_node_insert (AsImage *image, + GNode *parent); +gboolean as_image_node_parse (AsImage *image, + GNode *node, + GError **error); + +G_END_DECLS + +#endif /* __AS_IMAGE_PRIVATE_H */ diff --git a/libappstream-glib/as-image.c b/libappstream-glib/as-image.c index c247fef..5640722 100644 --- a/libappstream-glib/as-image.c +++ b/libappstream-glib/as-image.c @@ -21,9 +21,9 @@ #include "config.h" -#include "as-image.h" -#include "as-node.h" -#include "as-utils.h" +#include "as-image-private.h" +#include "as-node-private.h" +#include "as-utils-private.h" typedef struct _AsImagePrivate AsImagePrivate; struct _AsImagePrivate diff --git a/libappstream-glib/as-image.h b/libappstream-glib/as-image.h index b27ddd7..357a9be 100644 --- a/libappstream-glib/as-image.h +++ b/libappstream-glib/as-image.h @@ -91,13 +91,6 @@ void as_image_set_height (AsImage *image, void as_image_set_kind (AsImage *image, AsImageKind kind); -/* object methods */ -GNode *as_image_node_insert (AsImage *image, - GNode *parent); -gboolean as_image_node_parse (AsImage *image, - GNode *node, - GError **error); - G_END_DECLS #endif /* __AS_IMAGE_H */ diff --git a/libappstream-glib/as-node-private.h b/libappstream-glib/as-node-private.h new file mode 100644 index 0000000..151ebb4 --- /dev/null +++ b/libappstream-glib/as-node-private.h @@ -0,0 +1,40 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- + * + * Copyright (C) 2014 Richard Hughes <richard@hughsie.com> + * + * Licensed under the GNU Lesser General Public License Version 2.1 + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#if !defined (__APPSTREAM_GLIB_PRIVATE_H) && !defined (AS_COMPILATION) +#error "Only <appstream-glib.h> can be included directly." +#endif + +#ifndef __AS_NODE_PRIVATE_H +#define __AS_NODE_PRIVATE_H + +#include "as-node.h" + +G_BEGIN_DECLS + +gchar *as_node_take_data (const GNode *node); +gint as_node_get_attribute_as_int (const GNode *node, + const gchar *key); + +G_END_DECLS + +#endif /* __AS_NODE_PRIVATE_H */ + diff --git a/libappstream-glib/as-node.c b/libappstream-glib/as-node.c index 54e4e78..bdedefd 100644 --- a/libappstream-glib/as-node.c +++ b/libappstream-glib/as-node.c @@ -24,8 +24,8 @@ #include <glib.h> #include <string.h> -#include "as-node.h" -#include "as-utils.h" +#include "as-node-private.h" +#include "as-utils-private.h" typedef struct { diff --git a/libappstream-glib/as-node.h b/libappstream-glib/as-node.h index 244fb66..3ba4c12 100644 --- a/libappstream-glib/as-node.h +++ b/libappstream-glib/as-node.h @@ -63,11 +63,8 @@ void as_node_unref (GNode *node); const gchar *as_node_get_name (const GNode *node); const gchar *as_node_get_data (const GNode *node); -gchar *as_node_take_data (const GNode *node); const gchar *as_node_get_attribute (const GNode *node, const gchar *key); -gint as_node_get_attribute_as_int (const GNode *node, - const gchar *key); GHashTable *as_node_get_localized (const GNode *node, const gchar *key); const gchar *as_node_get_localized_best (const GNode *node, diff --git a/libappstream-glib/as-release-private.h b/libappstream-glib/as-release-private.h new file mode 100644 index 0000000..3b0717e --- /dev/null +++ b/libappstream-glib/as-release-private.h @@ -0,0 +1,41 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- + * + * Copyright (C) 2014 Richard Hughes <richard@hughsie.com> + * + * Licensed under the GNU Lesser General Public License Version 2.1 + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#if !defined (__APPSTREAM_GLIB_PRIVATE_H) && !defined (AS_COMPILATION) +#error "Only <appstream-glib.h> can be included directly." +#endif + +#ifndef __AS_RELEASE_PRIVATE_H +#define __AS_RELEASE_PRIVATE_H + +#include "as-release.h" + +G_BEGIN_DECLS + +GNode *as_release_node_insert (AsRelease *release, + GNode *parent); +gboolean as_release_node_parse (AsRelease *release, + GNode *node, + GError **error); + +G_END_DECLS + +#endif /* __AS_RELEASE_PRIVATE_H */ diff --git a/libappstream-glib/as-release.c b/libappstream-glib/as-release.c index b7e1e5d..bfb9920 100644 --- a/libappstream-glib/as-release.c +++ b/libappstream-glib/as-release.c @@ -23,10 +23,10 @@ #include <stdlib.h> -#include "as-node.h" -#include "as-release.h" +#include "as-node-private.h" +#include "as-release-private.h" #include "as-tag.h" -#include "as-utils.h" +#include "as-utils-private.h" typedef struct _AsReleasePrivate AsReleasePrivate; struct _AsReleasePrivate diff --git a/libappstream-glib/as-release.h b/libappstream-glib/as-release.h index 22b6291..9e1a968 100644 --- a/libappstream-glib/as-release.h +++ b/libappstream-glib/as-release.h @@ -79,13 +79,6 @@ void as_release_set_description (AsRelease *release, const gchar *description, gssize description_len); -/* object methods */ -GNode *as_release_node_insert (AsRelease *release, - GNode *parent); -gboolean as_release_node_parse (AsRelease *release, - GNode *node, - GError **error); - G_END_DECLS #endif /* __AS_RELEASE_H */ diff --git a/libappstream-glib/as-screenshot-private.h b/libappstream-glib/as-screenshot-private.h new file mode 100644 index 0000000..2e25c80 --- /dev/null +++ b/libappstream-glib/as-screenshot-private.h @@ -0,0 +1,43 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- + * + * Copyright (C) 2014 Richard Hughes <richard@hughsie.com> + * + * Licensed under the GNU Lesser General Public License Version 2.1 + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#if !defined (__APPSTREAM_GLIB_PRIVATE_H) && !defined (AS_COMPILATION) +#error "Only <appstream-glib.h> can be included directly." +#endif + +#ifndef __AS_SCREENSHOT_PRIVATE_H +#define __AS_SCREENSHOT_PRIVATE_H + +#include <glib-object.h> + +#include "as-screenshot.h" + +G_BEGIN_DECLS + +GNode *as_screenshot_node_insert (AsScreenshot *screenshot, + GNode *parent); +gboolean as_screenshot_node_parse (AsScreenshot *screenshot, + GNode *node, + GError **error); + +G_END_DECLS + +#endif /* __AS_SCREENSHOT_PRIVATE_H */ diff --git a/libappstream-glib/as-screenshot.c b/libappstream-glib/as-screenshot.c index 0d83a17..258d56c 100644 --- a/libappstream-glib/as-screenshot.c +++ b/libappstream-glib/as-screenshot.c @@ -21,10 +21,11 @@ #include "config.h" +#include "as-image-private.h" #include "as-node.h" -#include "as-screenshot.h" +#include "as-screenshot-private.h" #include "as-tag.h" -#include "as-utils.h" +#include "as-utils-private.h" typedef struct _AsScreenshotPrivate AsScreenshotPrivate; struct _AsScreenshotPrivate diff --git a/libappstream-glib/as-screenshot.h b/libappstream-glib/as-screenshot.h index 5353bb6..a252d51 100644 --- a/libappstream-glib/as-screenshot.h +++ b/libappstream-glib/as-screenshot.h @@ -92,13 +92,6 @@ void as_screenshot_set_caption (AsScreenshot *screenshot, void as_screenshot_add_image (AsScreenshot *screenshot, AsImage *image); -/* object methods */ -GNode *as_screenshot_node_insert (AsScreenshot *screenshot, - GNode *parent); -gboolean as_screenshot_node_parse (AsScreenshot *screenshot, - GNode *node, - GError **error); - G_END_DECLS #endif /* __AS_SCREENSHOT_H */ diff --git a/libappstream-glib/as-self-test.c b/libappstream-glib/as-self-test.c index 5f1bfab..781f95f 100644 --- a/libappstream-glib/as-self-test.c +++ b/libappstream-glib/as-self-test.c @@ -23,13 +23,13 @@ #include <glib.h> -#include "as-app.h" -#include "as-image.h" -#include "as-node.h" -#include "as-release.h" -#include "as-screenshot.h" +#include "as-app-private.h" +#include "as-image-private.h" +#include "as-node-private.h" +#include "as-release-private.h" +#include "as-screenshot-private.h" #include "as-store.h" -#include "as-utils.h" +#include "as-utils-private.h" static void ch_test_release_func (void) diff --git a/libappstream-glib/as-store.c b/libappstream-glib/as-store.c index 7e0f58c..455f4fb 100644 --- a/libappstream-glib/as-store.c +++ b/libappstream-glib/as-store.c @@ -21,6 +21,7 @@ #include "config.h" +#include "as-app-private.h" #include "as-node.h" #include "as-store.h" diff --git a/libappstream-glib/as-utils-private.h b/libappstream-glib/as-utils-private.h new file mode 100644 index 0000000..991bf3a --- /dev/null +++ b/libappstream-glib/as-utils-private.h @@ -0,0 +1,40 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- + * + * Copyright (C) 2014 Richard Hughes <richard@hughsie.com> + * + * Licensed under the GNU Lesser General Public License Version 2.1 + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#if !defined (__APPSTREAM_GLIB_PRIVATE_H) && !defined (AS_COMPILATION) +#error "Only <appstream-glib.h> can be included directly." +#endif + +#ifndef __AS_UTILS_PRIVATE_H +#define __AS_UTILS_PRIVATE_H + +#include "as-utils.h" + +G_BEGIN_DECLS + +gchar *as_strndup (const gchar *text, + gssize text_len); +const gchar *as_hash_lookup_by_locale (GHashTable *hash, + const gchar *locale); + +G_END_DECLS + +#endif /* __AS_UTILS_PRIVATE_H */ diff --git a/libappstream-glib/as-utils.c b/libappstream-glib/as-utils.c index 51f0e7e..398fec3 100644 --- a/libappstream-glib/as-utils.c +++ b/libappstream-glib/as-utils.c @@ -23,6 +23,7 @@ #include "as-node.h" #include "as-utils.h" +#include "as-utils-private.h" /** * as_strndup: diff --git a/libappstream-glib/as-utils.h b/libappstream-glib/as-utils.h index 3a57ee1..22d6e19 100644 --- a/libappstream-glib/as-utils.h +++ b/libappstream-glib/as-utils.h @@ -28,13 +28,11 @@ #include <glib.h> -gchar *as_strndup (const gchar *text, - gssize text_len); +G_BEGIN_DECLS + gchar *as_markup_convert_simple (const gchar *markup, gssize markup_len, GError **error); -const gchar *as_hash_lookup_by_locale (GHashTable *hash, - const gchar *locale); G_END_DECLS |