Branch: refs/heads/master Author: Colomban Wendling ban@herbesfolles.org Committer: Colomban Wendling ban@herbesfolles.org Date: Fri, 04 Mar 2016 22:07:04 UTC Commit: 856ee6633f393ca9e230599570af1b06c74b9ea8 https://github.com/geany/geany/commit/856ee6633f393ca9e230599570af1b06c74b9e...
Log Message: ----------- Replace filetype_id with GeanyFiletypeID
Used only in static functions so no API change.
Modified Paths: -------------- src/filetypes.c src/symbols.c
Modified: src/filetypes.c 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -24,7 +24,7 @@ * Filetype detection, file extensions and filetype menu items. */
-/* Note: we use filetype_id for some function arguments, but GeanyFiletype is better; we should +/* Note: we use GeanyFiletypeID for some function arguments, but GeanyFiletype is better; we should * only use GeanyFiletype for API functions. */
#ifdef HAVE_CONFIG_H @@ -110,7 +110,7 @@ static gchar *filetype_make_title(const char *name, enum TitleType type)
/* name argument (ie filetype name) must not be translated as it is used for * filetype lookup. Use filetypes_get_display_name() instead.*/ -static void ft_init(filetype_id ft_id, TMParserType lang, const char *name, +static void ft_init(GeanyFiletypeID ft_id, TMParserType lang, const char *name, const char *title_name, enum TitleType title_type, GeanyFiletypeGroupID group_id) { @@ -325,7 +325,7 @@ static void init_custom_filetypes(const gchar *path) * Warning: GTK isn't necessarily initialized yet. */ void filetypes_init_types(void) { - filetype_id ft_id; + GeanyFiletypeID ft_id; gchar *f;
g_return_if_fail(filetypes_array == NULL); @@ -616,7 +616,7 @@ static GeanyFiletype *find_shebang(const gchar *utf8_filename, const gchar *line { static const struct { const gchar *name; - filetype_id filetype; + GeanyFiletypeID filetype; } intepreter_map[] = { { "sh", GEANY_FILETYPES_SH }, { "bash", GEANY_FILETYPES_SH },
Modified: src/symbols.c 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -139,7 +139,7 @@ static struct symbol_menu;
static void html_tags_loaded(void); -static void load_user_tags(filetype_id ft_id); +static void load_user_tags(GeanyFiletypeID ft_id);
/* get the tags_ignore list, exported by tagmanager's options.c */ extern gchar **c_tags_ignore; @@ -524,7 +524,7 @@ tag_list_add_groups(GtkTreeStore *tree_store, ...)
static void add_top_level_items(GeanyDocument *doc) { - filetype_id ft_id = doc->file_type->id; + GeanyFiletypeID ft_id = doc->file_type->id; GtkTreeStore *tag_store = doc->priv->tag_store;
if (top_level_iter_names == NULL) @@ -998,7 +998,7 @@ static gchar *get_symbol_tooltip(GeanyDocument *doc, const TMTag *tag)
/* find the last word in "foo::bar::blah", e.g. "blah" */ -static const gchar *get_parent_name(const TMTag *tag, filetype_id ft_id) +static const gchar *get_parent_name(const TMTag *tag, GeanyFiletypeID ft_id) { const gchar *scope = tag->scope; const gchar *separator = symbols_get_context_separator(ft_id); @@ -1798,7 +1798,7 @@ static void init_user_tags(void) }
-static void load_user_tags(filetype_id ft_id) +static void load_user_tags(GeanyFiletypeID ft_id) { static guchar *tags_loaded = NULL; static gboolean init_tags = FALSE;
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).