[gtk/wip/baedert/test-cflags] builder: Make object names a const array
- From: Timm Bäder <baedert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/baedert/test-cflags] builder: Make object names a const array
- Date: Sat, 7 Mar 2020 14:18:14 +0000 (UTC)
commit 06aa4b6c1c991c27028d12dc59cc632ea0576150
Author: Timm Bäder <mail baedert org>
Date: Sat Mar 7 15:15:56 2020 +0100
builder: Make object names a const array
We don't take ownership.
demos/gtk-demo/main.c | 2 +-
gtk/gtkbuilder.c | 6 +++---
gtk/gtkbuilder.h | 6 +++---
gtk/gtkbuilderparser.c | 2 +-
gtk/gtkbuilderprivate.h | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/demos/gtk-demo/main.c b/demos/gtk-demo/main.c
index d9c8c7e9a6..c552f9874e 100644
--- a/demos/gtk-demo/main.c
+++ b/demos/gtk-demo/main.c
@@ -981,7 +981,7 @@ startup (GApplication *app)
const char *ids[] = { "appmenu", NULL };
builder = gtk_builder_new ();
- gtk_builder_add_objects_from_resource (builder, "/ui/appmenu.ui", (char **)ids, NULL);
+ gtk_builder_add_objects_from_resource (builder, "/ui/appmenu.ui", ids, NULL);
appmenu = (GMenuModel *)gtk_builder_get_object (builder, "appmenu");
diff --git a/gtk/gtkbuilder.c b/gtk/gtkbuilder.c
index 1702a37aa9..ba3f367ddc 100644
--- a/gtk/gtkbuilder.c
+++ b/gtk/gtkbuilder.c
@@ -1151,7 +1151,7 @@ gtk_builder_add_from_file (GtkBuilder *builder,
gboolean
gtk_builder_add_objects_from_file (GtkBuilder *builder,
const gchar *filename,
- gchar **object_ids,
+ const char **object_ids,
GError **error)
{
GtkBuilderPrivate *priv = gtk_builder_get_instance_private (builder);
@@ -1352,7 +1352,7 @@ gtk_builder_add_from_resource (GtkBuilder *builder,
gboolean
gtk_builder_add_objects_from_resource (GtkBuilder *builder,
const gchar *resource_path,
- gchar **object_ids,
+ const char **object_ids,
GError **error)
{
GtkBuilderPrivate *priv = gtk_builder_get_instance_private (builder);
@@ -1483,7 +1483,7 @@ gboolean
gtk_builder_add_objects_from_string (GtkBuilder *builder,
const gchar *buffer,
gssize length,
- gchar **object_ids,
+ const char **object_ids,
GError **error)
{
GtkBuilderPrivate *priv = gtk_builder_get_instance_private (builder);
diff --git a/gtk/gtkbuilder.h b/gtk/gtkbuilder.h
index df49e7a4cf..94e8ed292b 100644
--- a/gtk/gtkbuilder.h
+++ b/gtk/gtkbuilder.h
@@ -114,18 +114,18 @@ gboolean gtk_builder_add_from_string (GtkBuilder *builder,
GDK_AVAILABLE_IN_ALL
gboolean gtk_builder_add_objects_from_file (GtkBuilder *builder,
const gchar *filename,
- gchar **object_ids,
+ const char **object_ids,
GError **error);
GDK_AVAILABLE_IN_ALL
gboolean gtk_builder_add_objects_from_resource(GtkBuilder *builder,
const gchar *resource_path,
- gchar **object_ids,
+ const char **object_ids,
GError **error);
GDK_AVAILABLE_IN_ALL
gboolean gtk_builder_add_objects_from_string (GtkBuilder *builder,
const gchar *buffer,
gssize length,
- gchar **object_ids,
+ const char **object_ids,
GError **error);
GDK_AVAILABLE_IN_ALL
GObject* gtk_builder_get_object (GtkBuilder *builder,
diff --git a/gtk/gtkbuilderparser.c b/gtk/gtkbuilderparser.c
index 1301e778e2..fd2d6d91f7 100644
--- a/gtk/gtkbuilderparser.c
+++ b/gtk/gtkbuilderparser.c
@@ -1542,7 +1542,7 @@ _gtk_builder_parser_parse_buffer (GtkBuilder *builder,
const gchar *filename,
const gchar *buffer,
gssize length,
- gchar **requested_objs,
+ const char **requested_objs,
GError **error)
{
const gchar* domain;
diff --git a/gtk/gtkbuilderprivate.h b/gtk/gtkbuilderprivate.h
index 49833ae9d5..9ddf24b402 100644
--- a/gtk/gtkbuilderprivate.h
+++ b/gtk/gtkbuilderprivate.h
@@ -134,7 +134,7 @@ typedef struct {
GSList *finalizers;
GSList *custom_finalizers;
- char **requested_objects; /* NULL if all the objects are requested */
+ const char **requested_objects; /* NULL if all the objects are requested */
gboolean inside_requested_object;
gint requested_object_level;
gint cur_object_level;
@@ -160,7 +160,7 @@ void _gtk_builder_parser_parse_buffer (GtkBuilder *builder,
const gchar *filename,
const gchar *buffer,
gssize length,
- gchar **requested_objs,
+ const char **requested_objs,
GError **error);
GObject * _gtk_builder_construct (GtkBuilder *builder,
ObjectInfo *info,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]