Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

treestore: Cosmetics

Browse Source 
Some renaming in the buildable code to make it more
similar to the liststore implementation.
This commit is contained in:
Matthias Clasen
2022-05-06 07:31:29 -04:00
parent b74aec3606
commit 1a488722fa
1 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
gtk/gtktreestore.c
View File

@@ -3318,18 +3318,18 @@ validate_gnode (GNode* node)
typedef struct {
GtkBuilder *builder;
GObject *object;
GSList *items;
} GSListSubParserData;
GSList *column_type_names;
} SubParserData;
static void
tree_model_start_element (GtkBuildableParseContext *context,
tree_store_start_element (GtkBuildableParseContext *context,
const char *element_name,
const char **names,
const char **values,
gpointer user_data,
GError **error)
{
GSListSubParserData *data = (GSListSubParserData*)user_data;
SubParserData *data = (SubParserData*)user_data;
if (strcmp (element_name, "columns") == 0)
{
@@ -3357,7 +3357,7 @@ tree_model_start_element (GtkBuildableParseContext *context,
return;
}
data->items = g_slist_prepend (data->items, g_strdup (type));
data->column_type_names = g_slist_prepend (data->column_type_names, g_strdup (type));
}
else
{
@@ -3368,12 +3368,12 @@ tree_model_start_element (GtkBuildableParseContext *context,
}
static void
tree_model_end_element (GtkBuildableParseContext *context,
tree_store_end_element (GtkBuildableParseContext *context,
const char *element_name,
gpointer user_data,
GError **error)
{
GSListSubParserData *data = (GSListSubParserData*)user_data;
SubParserData *data = (SubParserData*)user_data;
g_assert(data->builder);
@@ -3384,11 +3384,11 @@ tree_model_end_element (GtkBuildableParseContext *context,
int i;
GType type;
data = (GSListSubParserData*)user_data;
data->items = g_slist_reverse (data->items);
types = g_new0 (GType, g_slist_length (data->items));
data = (SubParserData*)user_data;
data->column_type_names = g_slist_reverse (data->column_type_names);
types = g_new0 (GType, g_slist_length (data->column_type_names));
for (l = data->items, i = 0; l; l = l->next, i++)
for (l = data->column_type_names, i = 0; l; l = l->next, i++)
{
type = gtk_builder_get_type_from_name (data->builder, l->data);
if (type == G_TYPE_INVALID)
@@ -3409,10 +3409,10 @@ tree_model_end_element (GtkBuildableParseContext *context,
}
}
static const GtkBuildableParser tree_model_parser =
static const GtkBuildableParser tree_store_parser =
{
tree_model_start_element,
tree_model_end_element
tree_store_start_element,
tree_store_end_element
};
@@ -3424,19 +3424,19 @@ gtk_tree_store_buildable_custom_tag_start (GtkBuildable *buildable,
GtkBuildableParser *parser,
gpointer *parser_data)
{
GSListSubParserData *data;
SubParserData *data;
if (child)
return FALSE;
if (strcmp (tagname, "columns") == 0)
{
data = g_slice_new0 (GSListSubParserData);
data = g_slice_new0 (SubParserData);
data->builder = builder;
data->items = NULL;
data->column_type_names = NULL;
data->object = G_OBJECT (buildable);
*parser = tree_model_parser;
*parser = tree_store_parser;
*parser_data = data;
return TRUE;
@@ -3452,13 +3452,13 @@ gtk_tree_store_buildable_custom_finished (GtkBuildable *buildable,
const char *tagname,
gpointer user_data)
{
GSListSubParserData *data;
SubParserData *data;
if (strcmp (tagname, "columns"))
return;
data = (GSListSubParserData*)user_data;
data = (SubParserData*)user_data;
g_slist_free (data->items);
g_slice_free (GSListSubParserData, data);
g_slist_free (data->column_type_names);
g_slice_free (SubParserData, data);
}